Merge pull request #172 from TouchStar/master

oysteinkrog · oysteinkrog · commit 3231d2dbe603 · 2015-05-13T16:56:26.000+02:00
Added SourceID support throughout platforms (marshals to sqlite3_sourceid API)
diff --git a/src/SQLite.Net.Platform.Generic/SQLiteApiGeneric.cs b/src/SQLite.Net.Platform.Generic/SQLiteApiGeneric.cs
@@ -25,6 +25,11 @@ public int LibVersionNumber()
             return SQLiteApiGenericInternal.sqlite3_libversion_number();
         }
 
+        public string SourceID()
+        {            
+			return Marshal.PtrToStringAuto(SQLiteApiGenericInternal.sqlite3_sourceid());
+        }        
+
         public Result EnableLoadExtension(IDbHandle db, int onoff)
         {
             var internalDbHandle = (DbHandle) db;
diff --git a/src/SQLite.Net.Platform.Generic/SQLiteApiGenericInternal.cs b/src/SQLite.Net.Platform.Generic/SQLiteApiGenericInternal.cs
@@ -155,6 +155,9 @@ public static extern Result sqlite3_prepare_v2(IntPtr db,
         [DllImport("sqlite3", EntryPoint = "sqlite3_libversion_number", CallingConvention = CallingConvention.Cdecl)]
         public static extern int sqlite3_libversion_number();
 
+        [DllImport("sqlite3", EntryPoint = "sqlite3_sourceid", CallingConvention = CallingConvention.Cdecl)]		
+		public static extern IntPtr sqlite3_sourceid();
+
         #region Backup
 
         [DllImport("sqlite3", EntryPoint = "sqlite3_backup_init", CallingConvention = CallingConvention.Cdecl)]
diff --git a/src/SQLite.Net.Platform.Win32/SQLiteApiWin32.cs b/src/SQLite.Net.Platform.Win32/SQLiteApiWin32.cs
@@ -24,6 +24,11 @@ public int LibVersionNumber()
         {
             return SQLiteApiWin32Internal.sqlite3_libversion_number();
         }
+        
+        public string SourceID()
+        {
+			return Marshal.PtrToStringAuto(SQLiteApiWin32Internal.sqlite3_sourceid());            
+        }                
 
         public Result EnableLoadExtension(IDbHandle db, int onoff)
         {
diff --git a/src/SQLite.Net.Platform.Win32/SQliteApiWin32Internal.cs b/src/SQLite.Net.Platform.Win32/SQliteApiWin32Internal.cs
@@ -191,6 +191,9 @@ public static byte[] ColumnByteArray(IntPtr stmt, int index)
         [DllImport("SQLite.Interop.dll", EntryPoint = "sqlite3_libversion_number", CallingConvention = CallingConvention.Cdecl)]
         public static extern int sqlite3_libversion_number();
 
+        [DllImport("SQLite.Interop.dll", EntryPoint = "sqlite3_sourceid", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr sqlite3_sourceid();
+
         #region Backup
         
         [DllImport("SQLite.Interop.dll", EntryPoint = "sqlite3_backup_init", CallingConvention = CallingConvention.Cdecl)]
diff --git a/src/SQLite.Net.Platform.WinRT/SQLiteApiWinRT.cs b/src/SQLite.Net.Platform.WinRT/SQLiteApiWinRT.cs
@@ -157,6 +157,11 @@ public int LibVersionNumber()
             return SQLite3.sqlite3_libversion_number();
         }
 
+        public string SourceID()
+        {
+            return Marshal.PtrToStringAuto(SQLite3.sqlite3_sourceid());  
+        }        
+
         public Result EnableLoadExtension(IDbHandle db, int onoff)
         {
             return (Result)1;
@@ -451,6 +456,9 @@ public static byte[] ColumnByteArray(IntPtr stmt, int index)
         [DllImport("sqlite3", EntryPoint = "sqlite3_libversion_number", CallingConvention = CallingConvention.Cdecl)]
         public static extern int sqlite3_libversion_number();
 
+        [DllImport("sqlite3", EntryPoint = "sqlite3_sourceid", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_sourceid();
+
         #region Backup
 
         [DllImport("sqlite3", EntryPoint = "sqlite3_backup_init", CallingConvention = CallingConvention.Cdecl)]
diff --git a/src/SQLite.Net.Platform.WindowsPhone8/SQLiteApiWP8.cs b/src/SQLite.Net.Platform.WindowsPhone8/SQLiteApiWP8.cs
@@ -31,6 +31,14 @@ public int LibVersionNumber()
 //            return Sqlite3.sqlite3_libversion_number();
         }
 
+        public string SourceID()
+        {
+            // not supported
+            return String.Empty;
+//            return Sqlite3.sqlite3_sourceid();
+        }                
+
+
         public Result EnableLoadExtension(IDbHandle db, int onoff)
         {
             var dbHandle = (DbHandle) db;
diff --git a/src/SQLite.Net.Platform.XamarinAndroid/SQLiteApiAndroid.cs b/src/SQLite.Net.Platform.XamarinAndroid/SQLiteApiAndroid.cs
@@ -25,6 +25,11 @@ public int LibVersionNumber()
             return SQLiteApiAndroidInternal.sqlite3_libversion_number();
         }
 
+        public string SourceID()
+        {
+			return Marshal.PtrToStringAuto(SQLiteApiAndroidInternal.sqlite3_sourceid());            
+        }                
+
         public Result EnableLoadExtension(IDbHandle db, int onoff)
         {
             var internalDbHandle = (DbHandle) db;
diff --git a/src/SQLite.Net.Platform.XamarinAndroid/SQLiteApiAndroidInternal.cs b/src/SQLite.Net.Platform.XamarinAndroid/SQLiteApiAndroidInternal.cs
@@ -62,10 +62,10 @@ public static extern int sqlite3_bind_text16(IntPtr stmt,
         [DllImport(DllName, EntryPoint = "sqlite3_close", CallingConvention = CallingConvention.Cdecl)]
         public static extern Result sqlite3_close(IntPtr db);
 
-        [DllImport("sqlite3", EntryPoint = "sqlite3_initialize", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport(DllName, EntryPoint = "sqlite3_initialize", CallingConvention = CallingConvention.Cdecl)]
         public static extern Result sqlite3_initialize();
 
-        [DllImport("sqlite3", EntryPoint = "sqlite3_shutdown", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport(DllName, EntryPoint = "sqlite3_shutdown", CallingConvention = CallingConvention.Cdecl)]
         public static extern Result sqlite3_shutdown();
 
         [DllImport(DllName, EntryPoint = "sqlite3_column_blob", CallingConvention = CallingConvention.Cdecl)]
@@ -151,12 +151,15 @@ public static extern Result sqlite3_prepare_v2(IntPtr db,
         [DllImport(DllName, EntryPoint = "sqlite3_column_name16", CallingConvention = CallingConvention.Cdecl)]
         private static extern IntPtr sqlite3_column_name16(IntPtr stmt, int index);
 
-        [DllImport("sqlite3", EntryPoint = "sqlite3_extended_errcode", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport(DllName, EntryPoint = "sqlite3_extended_errcode", CallingConvention = CallingConvention.Cdecl)]
         public static extern ExtendedResult sqlite3_extended_errcode(IntPtr db);
 
-        [DllImport("sqlite3", EntryPoint = "sqlite3_libversion_number", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport(DllName, EntryPoint = "sqlite3_libversion_number", CallingConvention = CallingConvention.Cdecl)]
         public static extern int sqlite3_libversion_number();
 
+        [DllImport(DllName, EntryPoint = "sqlite3_sourceid", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr sqlite3_sourceid();
+
         #region Backup
         
         [DllImport(DllName, EntryPoint = "sqlite3_backup_init", CallingConvention = CallingConvention.Cdecl)]
diff --git a/src/SQLite.Net.Platform.XamarinIOS.Unified/SQLiteApiIOS.cs b/src/SQLite.Net.Platform.XamarinIOS.Unified/SQLiteApiIOS.cs
@@ -24,6 +24,11 @@ public int LibVersionNumber()
         {
             return SQLiteApiIOSInternal.sqlite3_libversion_number();
         }
+        
+        public string SourceID()
+        {
+            return Marshal.PtrToStringAuto(SQLiteApiIOSInternal.sqlite3_sourceid());
+        }                     
 
         public Result EnableLoadExtension(IDbHandle db, int onoff)
         {
diff --git a/src/SQLite.Net.Platform.XamarinIOS.Unified/SQLiteApiIOSInternal.cs b/src/SQLite.Net.Platform.XamarinIOS.Unified/SQLiteApiIOSInternal.cs
@@ -157,6 +157,9 @@ public static extern Result sqlite3_prepare_v2(IntPtr db,
         [DllImport("sqlite3", EntryPoint = "sqlite3_libversion_number", CallingConvention = CallingConvention.Cdecl)]
         public static extern int sqlite3_libversion_number();
 
+        [DllImport("sqlite3", EntryPoint = "sqlite3_sourceid", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_sourceid();
+        
         #region Backup
         
         [DllImport(DllName, EntryPoint = "sqlite3_backup_init", CallingConvention = CallingConvention.Cdecl)]
diff --git a/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOS.cs b/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOS.cs
@@ -20,6 +20,11 @@ public int LibVersionNumber() {
 			return SQLiteApiIOSInternal.sqlite3_libversion_number();
 		}
 
+        public string SourceID()
+        {
+            return Marshal.PtrToStringAuto(SQLiteApiIOSInternal.sqlite3_sourceid());
+        }                	
+
 		public Result EnableLoadExtension(IDbHandle db, int onoff) {
 			var internalDbHandle = (DbHandle)db;
 			return SQLiteApiIOSInternal.sqlite3_enable_load_extension(internalDbHandle.DbPtr, onoff);
diff --git a/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOSInternal.cs b/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOSInternal.cs
@@ -157,6 +157,9 @@ public static extern Result sqlite3_prepare_v2(IntPtr db,
         [DllImport("sqlite3", EntryPoint = "sqlite3_libversion_number", CallingConvention = CallingConvention.Cdecl)]
         public static extern int sqlite3_libversion_number();
 
+        [DllImport("sqlite3", EntryPoint = "sqlite3_sourceid", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_sourceid();
+        
         #region Backup
         
         [DllImport(DllName, EntryPoint = "sqlite3_backup_init", CallingConvention = CallingConvention.Cdecl)]
diff --git a/src/SQLite.Net/Interop/ISQLiteApi.cs b/src/SQLite.Net/Interop/ISQLiteApi.cs
@@ -32,6 +32,7 @@ public interface ISQLiteApi
 
         ExtendedResult ExtendedErrCode(IDbHandle db);
         int LibVersionNumber();
+        string SourceID();
         Result EnableLoadExtension(IDbHandle db, int onoff);
         Result Close(IDbHandle db);
         Result Initialize();

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,11 @@ public int LibVersionNumber()`
`25`	`25`	`return SQLiteApiGenericInternal.sqlite3_libversion_number();`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ public string SourceID()`
	`29`	`+ {`
	`30`	`+ return Marshal.PtrToStringAuto(SQLiteApiGenericInternal.sqlite3_sourceid());`
	`31`	`+ }`
	`32`	`+`
`28`	`33`	`public Result EnableLoadExtension(IDbHandle db, int onoff)`
`29`	`34`	`{`
`30`	`35`	`var internalDbHandle = (DbHandle) db;`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,11 @@ public int LibVersionNumber()`
`24`	`24`	`{`
`25`	`25`	`return SQLiteApiWin32Internal.sqlite3_libversion_number();`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+ public string SourceID()`
	`29`	`+ {`
	`30`	`+ return Marshal.PtrToStringAuto(SQLiteApiWin32Internal.sqlite3_sourceid());`
	`31`	`+ }`
`27`	`32`
`28`	`33`	`public Result EnableLoadExtension(IDbHandle db, int onoff)`
`29`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,14 @@ public int LibVersionNumber()`
`31`	`31`	`// return Sqlite3.sqlite3_libversion_number();`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ public string SourceID()`
	`35`	`+ {`
	`36`	`+ // not supported`
	`37`	`+ return String.Empty;`
	`38`	`+// return Sqlite3.sqlite3_sourceid();`
	`39`	`+ }`
	`40`	`+`
	`41`	`+`
`34`	`42`	`public Result EnableLoadExtension(IDbHandle db, int onoff)`
`35`	`43`	`{`
`36`	`44`	`var dbHandle = (DbHandle) db;`