Skip to content

Added SourceID support throughout platforms (marshals to sqlite3_sourceid API) #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 13, 2015
Merged

Added SourceID support throughout platforms (marshals to sqlite3_sourceid API) #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c05cac
Added SourceID support throughout platforms (marshals to sqlite3_sour…
thornley-touchstar Apr 27, 2015
dd15dd4
* Fixed DLLImport reference for Win32.
thornley-touchstar May 4, 2015
bbda6b5
* Corrected DLLImport name usage (now consistently using DllName cons…
thornley-touchstar May 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/SQLite.Net.Platform.Generic/SQLiteApiGeneric.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions src/SQLite.Net.Platform.Generic/SQLiteApiGenericInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
5 changes: 5 additions & 0 deletions src/SQLite.Net.Platform.Win32/SQLiteApiWin32.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
3 changes: 3 additions & 0 deletions src/SQLite.Net.Platform.Win32/SQliteApiWin32Internal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
8 changes: 8 additions & 0 deletions src/SQLite.Net.Platform.WinRT/SQLiteApiWinRT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)]
Expand Down
8 changes: 8 additions & 0 deletions src/SQLite.Net.Platform.WindowsPhone8/SQLiteApiWP8.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions src/SQLite.Net.Platform.XamarinAndroid/SQLiteApiAndroid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 7 additions & 4 deletions src/SQLite.Net.Platform.XamarinAndroid/SQLiteApiAndroidInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -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)]
Expand Down
5 changes: 5 additions & 0 deletions src/SQLite.Net.Platform.XamarinIOS.Unified/SQLiteApiIOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
3 changes: 3 additions & 0 deletions src/SQLite.Net.Platform.XamarinIOS.Unified/SQLiteApiIOSInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
5 changes: 5 additions & 0 deletions src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOSInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 1 addition & 0 deletions src/SQLite.Net/Interop/ISQLiteApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down