Merge pull request #294 from Yukinobu-Mine/non_ascii_query

oysteinkrog · oysteinkrog · commit ff63d8edff98 · 2016-05-22T19:04:50.000+02:00
Fix an issue that miscount length of a query including non-ascii characters Fix #147 Fix #101
diff --git a/src/SQLite.Net.Platform.Generic/SQLiteApiGeneric.cs b/src/SQLite.Net.Platform.Generic/SQLiteApiGeneric.cs
@@ -71,7 +71,7 @@ public IDbStatement Prepare2(IDbHandle db, string query)
         {
             var internalDbHandle = (DbHandle) db;
             IntPtr stmt;
-            Result r = SQLiteApiGenericInternal.sqlite3_prepare_v2(internalDbHandle.DbPtr, query, query.Length, out stmt, IntPtr.Zero);
+            Result r = SQLiteApiGenericInternal.sqlite3_prepare16_v2(internalDbHandle.DbPtr, query, -1, out stmt, IntPtr.Zero);
             if (r != Result.OK)
             {
                 throw SQLiteException.New(r, Errmsg16(internalDbHandle));
diff --git a/src/SQLite.Net.Platform.Generic/SQLiteApiGenericInternal.cs b/src/SQLite.Net.Platform.Generic/SQLiteApiGenericInternal.cs
@@ -126,9 +126,9 @@ public static extern int sqlite3_bind_text16(IntPtr stmt,
         [DllImport("sqlite3", EntryPoint = "sqlite3_open_v2", CallingConvention = CallingConvention.Cdecl)]
         public static extern Result sqlite3_open_v2(byte[] filename, out IntPtr db, int flags, IntPtr zvfs);
 
-        [DllImport("sqlite3", EntryPoint = "sqlite3_prepare_v2", CallingConvention = CallingConvention.Cdecl)]
-        public static extern Result sqlite3_prepare_v2(IntPtr db,
-            [MarshalAs(UnmanagedType.LPStr)] string sql,
+        [DllImport("sqlite3", EntryPoint = "sqlite3_prepare16_v2", CallingConvention = CallingConvention.Cdecl)]
+        public static extern Result sqlite3_prepare16_v2(IntPtr db,
+            [MarshalAs(UnmanagedType.LPWStr)] string sql,
             int numBytes,
             out IntPtr stmt,
             IntPtr pzTail);
diff --git a/src/SQLite.Net.Platform.OSX/SQLiteApiOSX.cs b/src/SQLite.Net.Platform.OSX/SQLiteApiOSX.cs
@@ -73,7 +73,7 @@ public IDbStatement Prepare2(IDbHandle db, string query)
         {
             var internalDbHandle = (DbHandle) db;
             IntPtr stmt;
-            Result r = SQLiteApiOSXInternal.sqlite3_prepare_v2(internalDbHandle.DbPtr, query, query.Length, out stmt, IntPtr.Zero);
+            Result r = SQLiteApiOSXInternal.sqlite3_prepare16_v2(internalDbHandle.DbPtr, query, -1, out stmt, IntPtr.Zero);
             if (r != Result.OK)
             {
                 throw SQLiteException.New(r, Errmsg16(internalDbHandle));
diff --git a/src/SQLite.Net.Platform.OSX/SQliteApiOSXInternal.cs b/src/SQLite.Net.Platform.OSX/SQliteApiOSXInternal.cs
@@ -50,9 +50,9 @@ public static extern Result sqlite3_open([MarshalAs(UnmanagedType.LPStr)] string
         [DllImport("libsqlite3_for_net", EntryPoint = "sqlite3_changes", CallingConvention = CallingConvention.Cdecl)]
         public static extern int sqlite3_changes(IntPtr db);
 
-        [DllImport("libsqlite3_for_net", EntryPoint = "sqlite3_prepare_v2", CallingConvention = CallingConvention.Cdecl)
+        [DllImport("libsqlite3_for_net", EntryPoint = "sqlite3_prepare16_v2", CallingConvention = CallingConvention.Cdecl)
         ]
-        public static extern Result sqlite3_prepare_v2(IntPtr db, [MarshalAs(UnmanagedType.LPStr)] string sql,
+        public static extern Result sqlite3_prepare16_v2(IntPtr db, [MarshalAs(UnmanagedType.LPWStr)] string sql,
             int numBytes,
             out IntPtr stmt, IntPtr pzTail);
 
diff --git a/src/SQLite.Net.Platform.Win32/SQLiteApiWin32.cs b/src/SQLite.Net.Platform.Win32/SQLiteApiWin32.cs
@@ -79,7 +79,7 @@ public IDbStatement Prepare2(IDbHandle db, string query)
         {
             var internalDbHandle = (DbHandle) db;
             IntPtr stmt;
-            Result r = SQLiteApiWin32Internal.sqlite3_prepare_v2(internalDbHandle.DbPtr, query, query.Length, out stmt, IntPtr.Zero);
+            Result r = SQLiteApiWin32Internal.sqlite3_prepare16_v2(internalDbHandle.DbPtr, query, -1, out stmt, IntPtr.Zero);
             if (r != Result.OK)
             {
                 throw SQLiteException.New(r, Errmsg16(internalDbHandle));
diff --git a/src/SQLite.Net.Platform.Win32/SQliteApiWin32Internal.cs b/src/SQLite.Net.Platform.Win32/SQliteApiWin32Internal.cs
@@ -90,9 +90,9 @@ public static extern Result sqlite3_open([MarshalAs(UnmanagedType.LPStr)] string
         [DllImport("SQLite.Interop.dll", EntryPoint = "sqlite3_changes", CallingConvention = CallingConvention.Cdecl)]
         public static extern int sqlite3_changes(IntPtr db);
 
-        [DllImport("SQLite.Interop.dll", EntryPoint = "sqlite3_prepare_v2", CallingConvention = CallingConvention.Cdecl)
+        [DllImport("SQLite.Interop.dll", EntryPoint = "sqlite3_prepare16_v2", CallingConvention = CallingConvention.Cdecl)
         ]
-        public static extern Result sqlite3_prepare_v2(IntPtr db, [MarshalAs(UnmanagedType.LPStr)] string sql,
+        public static extern Result sqlite3_prepare16_v2(IntPtr db, [MarshalAs(UnmanagedType.LPWStr)] string sql,
             int numBytes,
             out IntPtr stmt, IntPtr pzTail);
 
diff --git a/src/SQLite.Net.Platform.WinRT/SQLiteApiWinRT.cs b/src/SQLite.Net.Platform.WinRT/SQLiteApiWinRT.cs
@@ -204,7 +204,7 @@ public IDbStatement Prepare2(IDbHandle db, string query)
         {
             var dbHandle = (DbHandle)db;
             var stmt = default(Sqlite3Statement);
-            var r = SQLite3.Prepare2(dbHandle.InternalDbHandle, query, query.Length, out stmt, IntPtr.Zero);
+            var r = SQLite3.Prepare2(dbHandle.InternalDbHandle, query, -1, out stmt, IntPtr.Zero);
             if (r != Result.OK)
             {
                 throw SQLiteException.New(r, SQLite3.GetErrmsg(dbHandle.InternalDbHandle));
@@ -355,8 +355,8 @@ public static class SQLite3
         [DllImport("sqlite3", EntryPoint = "sqlite3_changes", CallingConvention = CallingConvention.Cdecl)]
         public static extern int Changes(IntPtr db);
 
-        [DllImport("sqlite3", EntryPoint = "sqlite3_prepare_v2", CallingConvention = CallingConvention.Cdecl)]
-        public static extern Result Prepare2(IntPtr db, [MarshalAs(UnmanagedType.LPStr)] string sql, int numBytes, out IntPtr stmt, IntPtr pzTail);
+        [DllImport("sqlite3", EntryPoint = "sqlite3_prepare16_v2", CallingConvention = CallingConvention.Cdecl)]
+        public static extern Result Prepare2(IntPtr db, [MarshalAs(UnmanagedType.LPWStr)] string sql, int numBytes, out IntPtr stmt, IntPtr pzTail);
 
         [DllImport("sqlite3", EntryPoint = "sqlite3_step", CallingConvention = CallingConvention.Cdecl)]
         public static extern Result Step(IntPtr stmt);
diff --git a/src/SQLite.Net.Platform.XamarinAndroid/SQLiteApiAndroid.cs b/src/SQLite.Net.Platform.XamarinAndroid/SQLiteApiAndroid.cs
@@ -72,7 +72,7 @@ public IDbStatement Prepare2(IDbHandle db, string query)
         {
             var internalDbHandle = (DbHandle) db;
             IntPtr stmt;
-            Result r = SQLiteApiAndroidInternal.sqlite3_prepare_v2(internalDbHandle.DbPtr, query, query.Length, out stmt, IntPtr.Zero);
+            Result r = SQLiteApiAndroidInternal.sqlite3_prepare16_v2(internalDbHandle.DbPtr, query, -1, out stmt, IntPtr.Zero);
             if (r != Result.OK)
             {
                 throw SQLiteException.New(r, Errmsg16(internalDbHandle));
diff --git a/src/SQLite.Net.Platform.XamarinAndroid/SQLiteApiAndroidInternal.cs b/src/SQLite.Net.Platform.XamarinAndroid/SQLiteApiAndroidInternal.cs
@@ -128,9 +128,9 @@ public static extern int sqlite3_bind_text16(IntPtr stmt,
         [DllImport(DllName, EntryPoint = "sqlite3_open_v2", CallingConvention = CallingConvention.Cdecl)]
         public static extern Result sqlite3_open_v2(byte[] filename, out IntPtr db, int flags, IntPtr zvfs);
 
-        [DllImport(DllName, EntryPoint = "sqlite3_prepare_v2", CallingConvention = CallingConvention.Cdecl)]
-        public static extern Result sqlite3_prepare_v2(IntPtr db,
-            [MarshalAs(UnmanagedType.LPStr)] string sql,
+        [DllImport(DllName, EntryPoint = "sqlite3_prepare16_v2", CallingConvention = CallingConvention.Cdecl)]
+        public static extern Result sqlite3_prepare16_v2(IntPtr db,
+            [MarshalAs(UnmanagedType.LPWStr)] string sql,
             int numBytes,
             out IntPtr stmt,
             IntPtr pzTail);
diff --git a/src/SQLite.Net.Platform.XamarinIOS.Unified/SQLiteApiIOS.cs b/src/SQLite.Net.Platform.XamarinIOS.Unified/SQLiteApiIOS.cs
@@ -72,7 +72,7 @@ public IDbStatement Prepare2(IDbHandle db, string query)
         {
             var internalDbHandle = (DbHandle) db;
             IntPtr stmt;
-            Result r = SQLiteApiIOSInternal.sqlite3_prepare_v2(internalDbHandle.DbPtr, query, query.Length, out stmt, IntPtr.Zero);
+            Result r = SQLiteApiIOSInternal.sqlite3_prepare16_v2(internalDbHandle.DbPtr, query, -1, out stmt, IntPtr.Zero);
             if (r != Result.OK)
             {
                 throw SQLiteException.New(r, Errmsg16(internalDbHandle));
diff --git a/src/SQLite.Net.Platform.XamarinIOS.Unified/SQLiteApiIOSInternal.cs b/src/SQLite.Net.Platform.XamarinIOS.Unified/SQLiteApiIOSInternal.cs
@@ -128,9 +128,9 @@ public static extern int sqlite3_bind_text16(IntPtr stmt,
         [DllImport(DllName, EntryPoint = "sqlite3_open_v2", CallingConvention = CallingConvention.Cdecl)]
         public static extern Result sqlite3_open_v2(byte[] filename, out IntPtr db, int flags, IntPtr zvfs);
 
-        [DllImport(DllName, EntryPoint = "sqlite3_prepare_v2", CallingConvention = CallingConvention.Cdecl)]
-        public static extern Result sqlite3_prepare_v2(IntPtr db,
-            [MarshalAs(UnmanagedType.LPStr)] string sql,
+        [DllImport(DllName, EntryPoint = "sqlite3_prepare16_v2", CallingConvention = CallingConvention.Cdecl)]
+        public static extern Result sqlite3_prepare16_v2(IntPtr db,
+            [MarshalAs(UnmanagedType.LPWStr)] string sql,
             int numBytes,
             out IntPtr stmt,
             IntPtr pzTail);
diff --git a/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOS.cs b/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOS.cs
@@ -60,9 +60,9 @@ public int Changes(IDbHandle db) {
 		public IDbStatement Prepare2(IDbHandle db, string query) {
 			var internalDbHandle = (DbHandle)db;
 			IntPtr stmt;
-			Result r = SQLiteApiIOSInternal.sqlite3_prepare_v2(internalDbHandle.DbPtr,
+			Result r = SQLiteApiIOSInternal.sqlite3_prepare16_v2(internalDbHandle.DbPtr,
 			                                                            query,
-			                                                            query.Length,
+			                                                            -1,
 			                                                            out stmt,
 			                                                            IntPtr.Zero);
 			if(r != Result.OK) {
diff --git a/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOSInternal.cs b/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOSInternal.cs
@@ -128,9 +128,9 @@ public static extern int sqlite3_bind_text16(IntPtr stmt,
         [DllImport(DllName, EntryPoint = "sqlite3_open_v2", CallingConvention = CallingConvention.Cdecl)]
         public static extern Result sqlite3_open_v2(byte[] filename, out IntPtr db, int flags, IntPtr zvfs);
 
-        [DllImport(DllName, EntryPoint = "sqlite3_prepare_v2", CallingConvention = CallingConvention.Cdecl)]
-        public static extern Result sqlite3_prepare_v2(IntPtr db,
-            [MarshalAs(UnmanagedType.LPStr)] string sql,
+        [DllImport(DllName, EntryPoint = "sqlite3_prepare16_v2", CallingConvention = CallingConvention.Cdecl)]
+        public static extern Result sqlite3_prepare16_v2(IntPtr db,
+            [MarshalAs(UnmanagedType.LPWStr)] string sql,
             int numBytes,
             out IntPtr stmt,
             IntPtr pzTail);
diff --git a/tests/UnicodeTest.cs b/tests/UnicodeTest.cs
@@ -1,49 +1,66 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using SQLite.Net.Attributes;
 
 namespace SQLite.Net.Tests
 {
-    [TestFixture]
-    public class UnicodeTest
-    {
-        [Test]
-        public void Insert()
-        {
-            var db = new TestDb();
+	[TestFixture]
+	public class UnicodeTest
+	{
+		[Table("\u7523\u54C1")]
+		public class UnicodeProduct
+		{
+			[AutoIncrement, PrimaryKey, Column("\u6A19\u8B58")]
+			public int Id { get; set; }
 
-            db.CreateTable<Product>();
+			[Column("\u540D")]
+			public string Name { get; set; }
 
-            string testString = "\u2329\u221E\u232A";
+			[Column("\u5024")]
+			public decimal Price { get; set; }
 
-            db.Insert(new Product
-            {
-                Name = testString,
-            });
+			[Column("\u53CE\u76CA")]
+			public uint TotalSales { get; set; }
+		}
 
-            var p = db.Get<Product>(1);
+		[Test]
+		public void Insert()
+		{
+			var db = new TestDb();
 
-            Assert.AreEqual(testString, p.Name);
-        }
+			db.CreateTable<UnicodeProduct>();
 
-        [Test]
-        public void Query()
-        {
-            var db = new TestDb();
+			string testString = "\u2329\u221E\u232A";
 
-            db.CreateTable<Product>();
+			db.Insert(new UnicodeProduct
+			{
+				Name = testString,
+			});
 
-            string testString = "\u2329\u221E\u232A";
+			var p = db.Get<UnicodeProduct>(1);
 
-            db.Insert(new Product
-            {
-                Name = testString,
-            });
+			Assert.AreEqual(testString, p.Name);
+		}
 
-            List<Product> ps = (from p in db.Table<Product>() where p.Name == testString select p).ToList();
+		[Test]
+		public void Query()
+		{
+			var db = new TestDb();
 
-            Assert.AreEqual(1, ps.Count);
-            Assert.AreEqual(testString, ps[0].Name);
-        }
-    }
+			db.CreateTable<UnicodeProduct>();
+
+			string testString = "\u2329\u221E\u232A";
+
+			db.Insert(new UnicodeProduct
+			{
+				Name = testString,
+			});
+
+			var ps = (from p in db.Table<UnicodeProduct>() where p.Name == testString select p).ToList();
+
+			Assert.AreEqual(1, ps.Count);
+			Assert.AreEqual(testString, ps[0].Name);
+		}
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public IDbStatement Prepare2(IDbHandle db, string query)`
`71`	`71`	`{`
`72`	`72`	`var internalDbHandle = (DbHandle) db;`
`73`	`73`	`IntPtr stmt;`
`74`		`- Result r = SQLiteApiGenericInternal.sqlite3_prepare_v2(internalDbHandle.DbPtr, query, query.Length, out stmt, IntPtr.Zero);`
	`74`	`+ Result r = SQLiteApiGenericInternal.sqlite3_prepare16_v2(internalDbHandle.DbPtr, query, -1, out stmt, IntPtr.Zero);`
`75`	`75`	`if (r != Result.OK)`
`76`	`76`	`{`
`77`	`77`	`throw SQLiteException.New(r, Errmsg16(internalDbHandle));`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public IDbStatement Prepare2(IDbHandle db, string query)`
`73`	`73`	`{`
`74`	`74`	`var internalDbHandle = (DbHandle) db;`
`75`	`75`	`IntPtr stmt;`
`76`		`- Result r = SQLiteApiOSXInternal.sqlite3_prepare_v2(internalDbHandle.DbPtr, query, query.Length, out stmt, IntPtr.Zero);`
	`76`	`+ Result r = SQLiteApiOSXInternal.sqlite3_prepare16_v2(internalDbHandle.DbPtr, query, -1, out stmt, IntPtr.Zero);`
`77`	`77`	`if (r != Result.OK)`
`78`	`78`	`{`
`79`	`79`	`throw SQLiteException.New(r, Errmsg16(internalDbHandle));`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public IDbStatement Prepare2(IDbHandle db, string query)`
`79`	`79`	`{`
`80`	`80`	`var internalDbHandle = (DbHandle) db;`
`81`	`81`	`IntPtr stmt;`
`82`		`- Result r = SQLiteApiWin32Internal.sqlite3_prepare_v2(internalDbHandle.DbPtr, query, query.Length, out stmt, IntPtr.Zero);`
	`82`	`+ Result r = SQLiteApiWin32Internal.sqlite3_prepare16_v2(internalDbHandle.DbPtr, query, -1, out stmt, IntPtr.Zero);`
`83`	`83`	`if (r != Result.OK)`
`84`	`84`	`{`
`85`	`85`	`throw SQLiteException.New(r, Errmsg16(internalDbHandle));`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public IDbStatement Prepare2(IDbHandle db, string query)`
`72`	`72`	`{`
`73`	`73`	`var internalDbHandle = (DbHandle) db;`
`74`	`74`	`IntPtr stmt;`
`75`		`- Result r = SQLiteApiAndroidInternal.sqlite3_prepare_v2(internalDbHandle.DbPtr, query, query.Length, out stmt, IntPtr.Zero);`
	`75`	`+ Result r = SQLiteApiAndroidInternal.sqlite3_prepare16_v2(internalDbHandle.DbPtr, query, -1, out stmt, IntPtr.Zero);`
`76`	`76`	`if (r != Result.OK)`
`77`	`77`	`{`
`78`	`78`	`throw SQLiteException.New(r, Errmsg16(internalDbHandle));`