amalgalite 1.6.3-x86-mingw32 → 1.8.0-x86-mingw32

data/ext/amalgalite/c/amalgalite_database.c

@@ -328,22 +328,59 @@ VALUE am_sqlite3_database_exec(VALUE self, VALUE rSQL)
 }
 
 /**
- * This function is registered with a sqlite3 database using the sqlite3_trace
- * function.  During the registration process a handle on a VALUE is also
- * registered.
+ * This function is registered with a sqlite3 database using the
+ * sqlite3_trace_v2 function. During the registration process a handle on a
+ * VALUE is also registered.
  *
  * When this function is called, it calls the 'trace' method on the tap object,
- * which is the VALUE that was registered during the sqlite3_trace call.
+ * which is the VALUE that was registered during the sqlite3_trace_v2 call.
  *
- * This function corresponds to the SQLite xTrace function specification.
+ * This function corresponds to the SQLite xCallback function specification.
+ *
+ * https://sqlite.org/c3ref/c_trace.html
  *
  */
-void amalgalite_xTrace(void* tap, const char* msg)
+int amalgalite_xTraceCallback(unsigned trace_type, void* tap, void* prepared_statement, void* extra)
 {
     VALUE     trace_obj = (VALUE) tap;
+    char*           msg;
+    sqlite3_uint64 time;
+
+    switch(trace_type) {
+        case SQLITE_TRACE_STMT:
+            msg = (char*)extra;
+
+            /* The callback can compute the same text that would have been returned by the
+             * legacy sqlite3_trace() interface by using the X argument when X begins with
+             * "--" and invoking sqlite3_expanded_sql(P) otherwise.
+             */
+            if (0 != strncmp(msg, "--", 2)) {
+                msg = sqlite3_expanded_sql(prepared_statement);
+            }
+
+            rb_funcall( trace_obj, rb_intern("trace"), 1, rb_str_new2( msg ) );
+            break;
 
-    rb_funcall( trace_obj, rb_intern("trace"), 1, rb_str_new2( msg ) );
-    return;
+        case SQLITE_TRACE_PROFILE:
+            msg = sqlite3_expanded_sql(prepared_statement);
+            time = *(sqlite3_uint64*)extra;
+            rb_funcall( trace_obj, rb_intern("profile"),
+                         2, rb_str_new2( msg ), SQLUINT64_2NUM(time) );
+            break;
+
+        case SQLITE_TRACE_ROW:
+            /* not implemented */
+            break;
+
+        case SQLITE_TRACE_CLOSE:
+            /* not implemented */
+            break;
+
+        default:
+            /* nothing */
+            break;
+    }
+    return 0;
 }
 
 
@@ -351,12 +388,16 @@ void amalgalite_xTrace(void* tap, const char* msg)
  * call-seq:
  *   database.register_trace_tap( tap_obj )
  *
- * This registers an object to be called with every trace event in SQLite.
+ * This registers an object to be called for all the trace objects in the sqlite
+ * system. From an SQLite perspective, the trace object is registered for both
+ * SQLITE_TRACE_STMT and SQLITE_TRACE_PROFILE.
  *
+ * The object must respond to both `trace` and `profile` methods. See
+ * Amalgalite::Trace::
  * This is an experimental api and is subject to change, or removal.
  *
  */
-VALUE am_sqlite3_database_register_trace_tap(VALUE self, VALUE tap)
+VALUE am_sqlite3_database_register_trace_tap(VALUE self, VALUE tap )
 {
     am_sqlite3   *am_db;
 
@@ -367,7 +408,7 @@ VALUE am_sqlite3_database_register_trace_tap(VALUE self, VALUE tap)
      */
     if ( Qnil == tap ) {
 
-        sqlite3_trace( am_db->db, NULL, NULL );
+        sqlite3_trace_v2( am_db->db, 0, NULL, NULL );
         rb_gc_unregister_address( &(am_db->trace_obj) );
         am_db->trace_obj = Qnil;
 
@@ -379,65 +420,12 @@ VALUE am_sqlite3_database_register_trace_tap(VALUE self, VALUE tap)
 
         am_db->trace_obj = tap;
         rb_gc_register_address( &(am_db->trace_obj) );
-        sqlite3_trace( am_db->db, amalgalite_xTrace, (void *)am_db->trace_obj );
+        sqlite3_trace_v2( am_db->db, SQLITE_TRACE_STMT | SQLITE_TRACE_PROFILE, amalgalite_xTraceCallback, (void *)am_db->trace_obj );
     }
 
     return Qnil;
 }
 
-
-/**
- * the amagliate trace function to be registered with register_trace_tap
- * When it is called, it calls the 'trace' method on the tap object.
- *
- * This function conforms to the sqlite3 xProfile function specification.
- */
-void amalgalite_xProfile(void* tap, const char* msg, sqlite3_uint64 time)
-{
-    VALUE     trace_obj = (VALUE) tap;
-
-    rb_funcall( trace_obj, rb_intern("profile"),
-                2, rb_str_new2( msg ), SQLUINT64_2NUM(time) );
-
-    return;
-}
-
-/**
- * call-seq:
- *   database.register_profile_tap( tap_obj )
- *
- * This registers an object to be called with every profile event in SQLite.
- *
- * This is an experimental api and is subject to change or removal.
- *
- */
-VALUE am_sqlite3_database_register_profile_tap(VALUE self, VALUE tap)
-{
-    am_sqlite3   *am_db;
-
-    Data_Get_Struct(self, am_sqlite3, am_db);
-
-    /* Qnil, unregister the item and tell the garbage collector we are done with
-     * it.
-     */
-
-    if ( tap == Qnil ) {
-        sqlite3_profile( am_db->db, NULL, NULL );
-        rb_gc_unregister_address( &(am_db->profile_obj) );
-        am_db->profile_obj = Qnil;
-
-    /* register the item and store the reference to the object in the am_db
-     * structure.  We also have to tell the Ruby garbage collector that we
-     * point to the Ruby object from C.
-     */
-    } else {
-        am_db->profile_obj = tap;
-        rb_gc_register_address( &(am_db->profile_obj) );
-        sqlite3_profile( am_db->db, amalgalite_xProfile, (void *)am_db->profile_obj );
-    }
-    return Qnil;
-}
-
 /**
  * invoke a ruby function.  This is here to be used by rb_protect.
  */
@@ -794,8 +782,11 @@ void amalgalite_xStep( sqlite3_context* context, int argc, sqlite3_value** argv
         VALUE klass = (VALUE) sqlite3_user_data( context );
         result = rb_protect( amalgalite_wrap_new_aggregate, klass, &state );
 
+        /* exception was raised during initialization */
         if ( state ) {
-            VALUE msg = ERROR_INFO_MESSAGE();
+            *aggregate_context = rb_gv_get("$!");
+            rb_gc_register_address( aggregate_context );
+            VALUE msg = rb_obj_as_string( *aggregate_context );
             sqlite3_result_error( context, RSTRING_PTR(msg), (int)RSTRING_LEN(msg));
             return;
         } else {
@@ -844,8 +835,30 @@ void amalgalite_xFinal( sqlite3_context* context )
     VALUE          result;
     int            state;
     am_protected_t protected;
+    VALUE          exception = Qnil;
     VALUE         *aggregate_context = (VALUE*)sqlite3_aggregate_context( context, sizeof( VALUE ) );
-    VALUE          exception = rb_iv_get( *aggregate_context, "@_exception" );
+
+    /**
+     * check and see if an exception had been throw at some point during the
+     * initialization of hte aggregate or during the step function call
+     *
+     */
+    if (TYPE(*aggregate_context) == T_OBJECT) {
+        /* if there is a @_exception value and it has a value then there was an
+         * exception during step function execution
+         */
+        if (rb_ivar_defined( *aggregate_context, rb_intern("@_exception") )) {
+            exception = rb_iv_get( *aggregate_context, "@_exception" );
+        } else {
+
+            /* if the aggregate context itself is an exception, then there was
+             * an error during teh initialization of the aggregate context
+             */
+            if (rb_obj_is_kind_of( *aggregate_context, rb_eException )) {
+                exception = *aggregate_context;
+            }
+        }
+    }
 
     if ( Qnil == exception ) {
         /* gather all the data to make the protected call */
@@ -868,8 +881,6 @@ void amalgalite_xFinal( sqlite3_context* context )
         sqlite3_result_error( context, RSTRING_PTR(msg), (int)RSTRING_LEN(msg) );
     }
 
-
-
     /* release the aggregate instance from garbage collector protection */
     rb_gc_unregister_address( aggregate_context );
 
@@ -1151,7 +1162,6 @@ void Init_amalgalite_database( )
     rb_define_method(cAS_Database, "last_insert_rowid", am_sqlite3_database_last_insert_rowid, 0); /* in amalgalite_database.c */
     rb_define_method(cAS_Database, "autocommit?", am_sqlite3_database_is_autocommit, 0); /* in amalgalite_database.c */
     rb_define_method(cAS_Database, "register_trace_tap", am_sqlite3_database_register_trace_tap, 1); /* in amalgalite_database.c */
-    rb_define_method(cAS_Database, "register_profile_tap", am_sqlite3_database_register_profile_tap, 1); /* in amalgalite_database.c */
     rb_define_method(cAS_Database, "table_column_metadata", am_sqlite3_database_table_column_metadata, 3); /* in amalgalite_database.c */
     rb_define_method(cAS_Database, "row_changes", am_sqlite3_database_row_changes, 0); /* in amalgalite_database.c */
     rb_define_method(cAS_Database, "total_changes", am_sqlite3_database_total_changes, 0); /* in amalgalite_database.c */

data/ext/amalgalite/c/extconf.rb

@@ -6,9 +6,12 @@ require 'rbconfig'
 $ruby = ARGV.shift if ARGV[0]
 
 # make available table and column meta data api
+$CFLAGS += " -DSQLITE_ENABLE_BYTECODE_VTAB=1"
 $CFLAGS += " -DSQLITE_ENABLE_COLUMN_METADATA=1"
 $CFLAGS += " -DSQLITE_ENABLE_DBSTAT_VTAB=1"
 $CFLAGS += " -DSQLITE_ENABLE_DBPAGE_VTAB=1"
+$CFLAGS += " -DSQLITE_ENABLE_DESERIALIZE=1"
+$CFLAGS += " -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1"
 $CFLAGS += " -DSQLITE_ENABLE_FTS3=1"
 $CFLAGS += " -DSQLITE_ENABLE_FTS3_PARENTHESIS=1"
 $CFLAGS += " -DSQLITE_ENABLE_FTS4=1"
@@ -16,14 +19,19 @@ $CFLAGS += " -DSQLITE_ENABLE_FTS5=1"
 $CFLAGS += " -DSQLITE_ENABLE_GEOPOLY=1"
 $CFLAGS += " -DSQLITE_ENABLE_JSON1=1"
 $CFLAGS += " -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1"
+$CFLAGS += " -DSQLITE_ENABLE_NULL_TRIM=1"
 $CFLAGS += " -DSQLITE_ENABLE_PREUPDATE_HOOK=1"
+$CFLAGS ++ " -DSQLITE_EANBLE_QPSG=1"
 $CFLAGS += " -DSQLITE_ENABLE_RBU=1"
 $CFLAGS += " -DSQLITE_ENABLE_RTREE=1"
 $CFLAGS += " -DSQLITE_ENABLE_SESSION=1"
+$CFLAGS += " -DSQLITE_ENABLE_SNAPSHOT=1"
 $CFLAGS += " -DSQLITE_ENABLE_STMTVTAB=1"
 $CFLAGS += " -DSQLITE_ENABLE_STAT4=1"
 $CFLAGS += " -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"
 
+$CFLAGS += " -DSQLITE_OMIT_DEPRECATED=1"
+
 # we compile sqlite the same way that the installation of ruby is compiled.
 if RbConfig::MAKEFILE_CONFIG['configure_args'].include?( "--enable-pthread" ) then
   $CFLAGS += " -DSQLITE_THREADSAFE=1"

data/ext/amalgalite/c/gen_constants.rb

@@ -38,6 +38,9 @@ result_codes = %w[
   SQLITE_WARNING
   SQLITE_ROW
   SQLITE_DONE
+  SQLITE_ERROR_MISSING_COLLSEQ
+  SQLITE_ERROR_RETRY
+  SQLITE_ERROR_SNAPSHOT
   SQLITE_IOERR_READ
   SQLITE_IOERR_SHORT_READ
   SQLITE_IOERR_WRITE
@@ -69,18 +72,28 @@ result_codes = %w[
   SQLITE_IOERR_BEGIN_ATOMIC
   SQLITE_IOERR_COMMIT_ATOMIC
   SQLITE_IOERR_ROLLBACK_ATOMIC
+  SQLITE_IOERR_DATA
+  SQLITE_IOERR_CORRUPTFS
   SQLITE_LOCKED_SHAREDCACHE
+  SQLITE_LOCKED_VTAB
   SQLITE_BUSY_RECOVERY
   SQLITE_BUSY_SNAPSHOT
+  SQLITE_BUSY_TIMEOUT
   SQLITE_CANTOPEN_NOTEMPDIR
   SQLITE_CANTOPEN_ISDIR
   SQLITE_CANTOPEN_FULLPATH
   SQLITE_CANTOPEN_CONVPATH
+  SQLITE_CANTOPEN_DIRTYWAL
+  SQLITE_CANTOPEN_SYMLINK
   SQLITE_CORRUPT_VTAB
+  SQLITE_CORRUPT_SEQUENCE
+  SQLITE_CORRUPT_INDEX
   SQLITE_READONLY_RECOVERY
   SQLITE_READONLY_CANTLOCK
   SQLITE_READONLY_ROLLBACK
   SQLITE_READONLY_DBMOVED
+  SQLITE_READONLY_CANTINIT
+  SQLITE_READONLY_DIRECTORY
   SQLITE_ABORT_ROLLBACK
   SQLITE_CONSTRAINT_CHECK
   SQLITE_CONSTRAINT_COMMITHOOK
@@ -92,11 +105,13 @@ result_codes = %w[
   SQLITE_CONSTRAINT_UNIQUE
   SQLITE_CONSTRAINT_VTAB
   SQLITE_CONSTRAINT_ROWID
+  SQLITE_CONSTRAINT_PINNED
   SQLITE_NOTICE_RECOVER_WAL
   SQLITE_NOTICE_RECOVER_ROLLBACK
   SQLITE_WARNING_AUTOINDEX
   SQLITE_AUTH_USER
   SQLITE_OK_LOAD_PERMANENTLY
+  SQLITE_OK_SYMLINK
 ]
 
 deprecated_codes = %w[ SQLITE_GET_LOCKPROXYFILE SQLITE_SET_LOCKPROXYFILE SQLITE_LAST_ERRNO ]
@@ -150,6 +165,9 @@ text_encoding_codes = %w[
   SQLITE_ANY
   SQLITE_UTF16_ALIGNED
   SQLITE_DETERMINISTIC
+  SQLITE_DIRECTONLY
+  SQLITE_SUBTYPE
+  SQLITE_INNOCUOUS
 ]
 
 data_type_codes = %w[
@@ -174,6 +192,8 @@ ignore_codes = [
   "SQLITE_FAIL",
   "SQLITE_REPLACE",
   "SQLITE_VTAB_CONSTRAINT_SUPPORT",
+  "SQLITE_VTAB_INNOCUOUS",
+  "SQLITE_VTAB_DIRECTONLY",
 
   # sqlite destructor callback codes
   "SQLITE_STATIC",
@@ -189,6 +209,9 @@ module_name_mapping  = {
   "SHM"        => "SHM",
   "SCANSTAT"   => "ScanStat",
   "STMTSTATUS" => "StatementStatus",
+  "CHANGESETAPPLY" => "ChangesetApply",
+  "CHANGESETSTART" => "ChangesetStart",
+  "TXN" => "Transaction",
 }
 
 defines = []