From: kmorimatsu <kmorimatsu@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Date: Tue, 17 Mar 2009 19:57:55 +0000 (+0000)
Subject: SQLite: support using '-- ' as comment.
X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-plugins.git;a=commitdiff_plain;h=28db45305f4cb96ed1afa18b9d63630a159fe87d

SQLite: support using '-- ' as comment.

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/plugin@986 1ca29b6e-896d-4ea0-84a5-967f57386b96
---

diff --git a/sqlite/trunk/nucleus/sqlite/sqlite.php b/sqlite/trunk/nucleus/sqlite/sqlite.php
index 271bdb9..3ce66cc 100644
--- a/sqlite/trunk/nucleus/sqlite/sqlite.php
+++ b/sqlite/trunk/nucleus/sqlite/sqlite.php
@@ -1,7 +1,7 @@
 <?php
     /****************************************
     * SQLite-MySQL wrapper for Nucleus      *
-    *                           ver 0.9.0.4 *
+    *                           ver 0.9.0.5 *
     * Written by Katsumi                    *
     ****************************************/
 
@@ -13,7 +13,7 @@ if (!function_exists('sqlite_open')) exit('Sorry, SQLite is not available from P
 require_once dirname(__FILE__) . '/sqliteconfig.php';
 $SQLITE_DBHANDLE=sqlite_open($SQLITECONF['DBFILENAME']);
 require_once dirname(__FILE__) . '/sqlitequeryfunctions.php';
-$SQLITECONF['VERSION']='0.9.0.4';
+$SQLITECONF['VERSION']='0.9.0.5';
 
 //Following thing may work if MySQL is NOT installed in server.
 if (!function_exists('mysql_query')) {
@@ -111,6 +111,9 @@ function nucleus_mysql_query($p1,$p2=null,$unbuffered=false){//echo htmlspecialc
 	if (strpos($query,"\xEF\xBB\xBF")===0) $query=substr($query,3);// UTF-8 stuff
 	if (substr($query,-1)==';') $query=substr($query,0,strlen($query)-1);
 	
+	// Remove MySQL specific comment, '-- '.
+	$query=preg_replace('/($|[\r\n])\-\-[\s^\r\n]([^\r\n]*)/','',$query);
+	
 	// Escape style is changed from MySQL type to SQLite type here.
 	// This is important to avoid possible SQL-injection.
 	$strpositions=array();// contains the data show where the strings are (startposition => endposition)