forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

binding overhaul

This commit is contained in:
Adam D. Ruppe 2024-06-10 14:17:14 -04:00
parent 5458c04325
commit 99a332ad76
1 changed files with 131 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
sqlite.d
View File

@ -1,31 +1,34 @@
/** /++
SQLite implementation of the [arsd.database.Database] interface. SQLite implementation of the [arsd.database.Database] interface.
Compile with version=sqlite_extended_metadata_available
if your sqlite is compiled with the
SQLITE_ENABLE_COLUMN_METADATA C-preprocessor symbol.
If you enable that, you get the ability to use the Compile with `-version=sqlite_extended_metadata_available` if your sqlite is compiled with the `SQLITE_ENABLE_COLUMN_METADATA` C-preprocessor symbol.
queryDataObject() function with sqlite. (You can still
use DataObjects, but you'll have to set up the mappings If you enable that, you get the ability to use the queryDataObject() function with sqlite. (You can still use DataObjects, but you'll have to set up the mappings manually without the extended metadata.)
manually without the extended metadata.)
*/ History:
Originally written prior to July 2011 (before arsd on git).
Only lightly modified before then and May 2024 when it got an overhaul.
FIXME: `PRAGMA foreign_keys = ON` is something i wanna enable by default in here.
+/
module arsd.sqlite; module arsd.sqlite;
version(static_sqlite) {} else version(static_sqlite) {} else
pragma(lib, "sqlite3"); pragma(lib, "sqlite3");
version(linux) version(linux)
pragma(lib, "dl"); // apparently sqlite3 depends on this pragma(lib, "dl"); // apparently sqlite3 depends on this
public import arsd.database; public import arsd.database;
import std.exception;
import std.string;
import core.stdc.stdlib; import core.stdc.stdlib;
import core.exception; import core.exception;
import core.memory; import core.memory;
import std.file;
import std.conv; import std.conv;
import std.string;
import std.exception;
/* /*
NOTE: NOTE:
@ -36,7 +39,7 @@ import std.conv;
*/ */
/** /++
The Database interface provides a consistent and safe way to access sql RDBMSs. The Database interface provides a consistent and safe way to access sql RDBMSs.
Why are all the classes scope? To ensure the database connection is closed when you are done with it. Why are all the classes scope? To ensure the database connection is closed when you are done with it.
@ -44,10 +47,10 @@ import std.conv;
(maybe including rolling back a transaction if one is going and it errors.... maybe, or that could bne (maybe including rolling back a transaction if one is going and it errors.... maybe, or that could bne
scope(exit)) scope(exit))
*/ +/
Sqlite openDBAndCreateIfNotPresent(string filename, string sql, scope void delegate(Sqlite db) initialize = null){ Sqlite openDBAndCreateIfNotPresent(string filename, string sql, scope void delegate(Sqlite db) initialize = null){
if(exists(filename)) static import std.file;
if(std.file.exists(filename))
return new Sqlite(filename); return new Sqlite(filename);
else { else {
auto db = new Sqlite(filename); auto db = new Sqlite(filename);
@ -73,7 +76,9 @@ void main() {
} }
*/ */
/// /++
+/
class Sqlite : Database { class Sqlite : Database {
public: public:
/++ /++
@ -207,10 +212,6 @@ class Sqlite : Database {
} }
class SqliteResult : ResultSet { class SqliteResult : ResultSet {
int getFieldIndex(string field) { int getFieldIndex(string field) {
foreach(i, n; columnNames) foreach(i, n; columnNames)
@ -235,7 +236,7 @@ class SqliteResult : ResultSet {
if(rows.length <= position) if(rows.length <= position)
throw new Exception("Result is empty"); throw new Exception("Result is empty");
foreach(c; rows[position]) { foreach(c; rows[position]) {
if(auto t = c.peek!(immutable(byte)[])) if(auto t = c.peek!(immutable(ubyte)[]))
r.row ~= DatabaseDatum(cast(string) *t); r.row ~= DatabaseDatum(cast(string) *t);
else if (auto d = c.peek!double) else if (auto d = c.peek!double)
// 17 significant decimal digits are enough to not lose precision (IEEE 754 section 5.12.2) // 17 significant decimal digits are enough to not lose precision (IEEE 754 section 5.12.2)
@ -268,10 +269,6 @@ class SqliteResult : ResultSet {
} }
struct Statement { struct Statement {
private this(Sqlite db, sqlite3_stmt * S) { private this(Sqlite db, sqlite3_stmt * S) {
this.db = db; this.db = db;
@ -367,22 +364,19 @@ struct Statement {
import core.stdc.string : strlen; import core.stdc.string : strlen;
sizediff_t l = strlen(str); sizediff_t l = strlen(str);
st.length = l; st.length = l;
for(int aa = 0; aa < l; aa++) st[] = str[0 ..l];
st[aa] = str[aa];
v = assumeUnique(st); v = assumeUnique(st);
break; break;
case SQLITE_BLOB: case SQLITE_BLOB:
byte* str = cast(byte*) sqlite3_column_blob(s, a); ubyte* str = cast(ubyte*) sqlite3_column_blob(s, a);
byte[] st; ubyte[] st;
int l = sqlite3_column_bytes(s, a); int l = sqlite3_column_bytes(s, a);
st.length = l; st.length = l;
for(int aa = 0; aa < l; aa++) st[] = str[0 .. l];
st[aa] = str[aa];
v = assumeUnique(st); v = assumeUnique(st);
break; break;
case SQLITE_NULL: case SQLITE_NULL:
string n = null; string n = null;
@ -622,10 +616,9 @@ template extract(A, T, R...){
} }
version(sqlite_extended_metadata_available) { version(sqlite_extended_metadata_available) {
import std.typecons; import std.typecons;
struct ResultByDataObject { struct ResultByDataObject {
this(SqliteResult r, Tuple!(string, string)[string] mappings, Sqlite db) { this(SqliteResult r, Tuple!(string, string)[string] mappings, Sqlite db) {
result = r; result = r;
this.db = db; this.db = db;
@ -647,24 +640,15 @@ struct ResultByDataObject {
SqliteResult result; SqliteResult result;
Sqlite db; Sqlite db;
}
} }
}
extern(C) int callback(void* cb, int howmany, char** text, char** columns) @system { extern(C) int callback(void* cb, int howmany, char** text, char** columns) @system {
if(cb is null) if(cb is null)
return 0; return 0;
void delegate(char[][char[]]) onEach = *cast(void delegate(char[][char[]])*)cb; void delegate(char[][char[]]) onEach = *cast(void delegate(char[][char[]])*) cb;
char[][char[]] row; char[][char[]] row;
import core.stdc.string : strlen; import core.stdc.string : strlen;
@ -690,18 +674,30 @@ extern(C) int callback(void* cb, int howmany, char** text, char** columns) @syst
return 0; return 0;
} }
extern(C) {
struct sqlite3;
struct sqlite3_stmt;
enum int SQLITE_OK = 0;
enum int SQLITE_ROW = 100;
enum int SQLITE_DONE = 101;
enum int SQLITE_INTEGER = 1; // int
enum int SQLITE_FLOAT = 2; // float
enum int SQLITE3_TEXT = 3; // char[]
enum int SQLITE_BLOB = 4; // ubyte[]
enum int SQLITE_NULL = 5; // void* = null
enum int SQLITE_DELETE = 9; // table name, null
enum int SQLITE_INSERT = 18; // table name, null
enum int SQLITE_UPDATE = 23; // table name, column name
enum int SQLITE_OPEN_READONLY = 0x1;
enum int SQLITE_OPEN_READWRITE = 0x2;
enum int SQLITE_OPEN_CREATE = 0x4;
enum int SQLITE_CANTOPEN = 14;
extern(C){
alias void sqlite3;
alias void sqlite3_stmt;
int sqlite3_changes(sqlite3*); int sqlite3_changes(sqlite3*);
int sqlite3_close(sqlite3 *); int sqlite3_close(sqlite3 *);
int sqlite3_exec( int sqlite3_exec(
@ -717,12 +713,12 @@ extern(C){
sqlite3 **ppDb /* OUT: SQLite db handle */ sqlite3 **ppDb /* OUT: SQLite db handle */
); );
int sqlite3_open_v2( int sqlite3_open_v2(
const char *filename, /* Database filename (UTF-8) */ const char *filename, /* Database filename (UTF-8) */
sqlite3 **ppDb, /* OUT: SQLite db handle */ sqlite3 **ppDb, /* OUT: SQLite db handle */
int flags, /* Flags */ int flags, /* Flags */
const char *zVfs /* Name of VFS module to use */ const char *zVfs /* Name of VFS module to use */
); );
int sqlite3_prepare_v2( int sqlite3_prepare_v2(
sqlite3 *db, /* Database handle */ sqlite3 *db, /* Database handle */
@ -730,59 +726,47 @@ int sqlite3_open_v2(
int nByte, /* Maximum length of zSql in bytes. */ int nByte, /* Maximum length of zSql in bytes. */
sqlite3_stmt **ppStmt, /* OUT: Statement handle */ sqlite3_stmt **ppStmt, /* OUT: Statement handle */
char **pzTail /* OUT: Pointer to unused portion of zSql */ char **pzTail /* OUT: Pointer to unused portion of zSql */
); );
int sqlite3_finalize(sqlite3_stmt *pStmt);
int sqlite3_step(sqlite3_stmt*);
long sqlite3_last_insert_rowid(sqlite3*);
const int SQLITE_OK = 0; int sqlite3_finalize(sqlite3_stmt *pStmt);
const int SQLITE_ROW = 100; int sqlite3_step(sqlite3_stmt*);
const int SQLITE_DONE = 101; long sqlite3_last_insert_rowid(sqlite3*);
const int SQLITE_INTEGER = 1; // int char *sqlite3_mprintf(const char*,...);
const int SQLITE_FLOAT = 2; // float
const int SQLITE3_TEXT = 3; // char[]
const int SQLITE_BLOB = 4; // byte[]
const int SQLITE_NULL = 5; // void* = null
char *sqlite3_mprintf(const char*,...); int sqlite3_reset(sqlite3_stmt *pStmt);
int sqlite3_clear_bindings(sqlite3_stmt*);
int sqlite3_bind_parameter_index(sqlite3_stmt*, const(char) *zName);
int sqlite3_bind_blob(sqlite3_stmt*, int, void*, int n, void*);
//int sqlite3_bind_blob(sqlite3_stmt*, int, void*, int n, void(*)(void*));
int sqlite3_bind_double(sqlite3_stmt*, int, double);
int sqlite3_bind_int(sqlite3_stmt*, int, int);
int sqlite3_bind_int64(sqlite3_stmt*, int, long);
int sqlite3_bind_null(sqlite3_stmt*, int);
int sqlite3_bind_text(sqlite3_stmt*, int, const(char)*, int n, void*);
//int sqlite3_bind_text(sqlite3_stmt*, int, char*, int n, void(*)(void*));
int sqlite3_reset(sqlite3_stmt *pStmt); void *sqlite3_column_blob(sqlite3_stmt*, int iCol);
int sqlite3_clear_bindings(sqlite3_stmt*); int sqlite3_column_bytes(sqlite3_stmt*, int iCol);
int sqlite3_bind_parameter_index(sqlite3_stmt*, const(char) *zName); double sqlite3_column_double(sqlite3_stmt*, int iCol);
int sqlite3_column_int(sqlite3_stmt*, int iCol);
long sqlite3_column_int64(sqlite3_stmt*, int iCol);
char *sqlite3_column_text(sqlite3_stmt*, int iCol);
int sqlite3_column_type(sqlite3_stmt*, int iCol);
char *sqlite3_column_name(sqlite3_stmt*, int N);
int sqlite3_bind_blob(sqlite3_stmt*, int, void*, int n, void*); int sqlite3_column_count(sqlite3_stmt *pStmt);
//int sqlite3_bind_blob(sqlite3_stmt*, int, void*, int n, void(*)(void*)); void sqlite3_free(void*);
int sqlite3_bind_double(sqlite3_stmt*, int, double);
int sqlite3_bind_int(sqlite3_stmt*, int, int);
int sqlite3_bind_int64(sqlite3_stmt*, int, long);
int sqlite3_bind_null(sqlite3_stmt*, int);
int sqlite3_bind_text(sqlite3_stmt*, int, const(char)*, int n, void*);
//int sqlite3_bind_text(sqlite3_stmt*, int, char*, int n, void(*)(void*));
void *sqlite3_column_blob(sqlite3_stmt*, int iCol);
int sqlite3_column_bytes(sqlite3_stmt*, int iCol);
double sqlite3_column_double(sqlite3_stmt*, int iCol);
int sqlite3_column_int(sqlite3_stmt*, int iCol);
long sqlite3_column_int64(sqlite3_stmt*, int iCol);
char *sqlite3_column_text(sqlite3_stmt*, int iCol);
int sqlite3_column_type(sqlite3_stmt*, int iCol);
char *sqlite3_column_name(sqlite3_stmt*, int N);
int sqlite3_column_count(sqlite3_stmt *pStmt);
void sqlite3_free(void*);
char *sqlite3_errmsg(sqlite3*); char *sqlite3_errmsg(sqlite3*);
const int SQLITE_OPEN_READONLY = 0x1; // will need these to enable support for DataObjects here
const int SQLITE_OPEN_READWRITE = 0x2; const(char*) sqlite3_column_database_name(sqlite3_stmt*,int);
const int SQLITE_OPEN_CREATE = 0x4; const(char*) sqlite3_column_table_name(sqlite3_stmt*,int);
const int SQLITE_CANTOPEN = 14; const(char*) sqlite3_column_origin_name(sqlite3_stmt*,int);
// https://www.sqlite.org/c3ref/update_hook.html
// will need these to enable support for DataObjects here void* sqlite3_update_hook(sqlite3* db, updatehookcallback cb, void* userData); // returns the old userData
const (char *)sqlite3_column_database_name(sqlite3_stmt*,int);
const (char *)sqlite3_column_table_name(sqlite3_stmt*,int);
const (char *)sqlite3_column_origin_name(sqlite3_stmt*,int);
} }
extern(C) alias updatehookcallback = void function(void* userData, int op, char* databaseName, char* tableName, /* sqlite3_int64 */ long rowid);