sqlite3 1.6.9-arm64-darwin → 1.7.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de1d9be4bba00791b899c16ba03a44617ef478d91d4dec53794ee82061f6f6e2
-  data.tar.gz: c6ef8ae80918ef49ecc84e4200bb324a37db29236b8ecc3bbd847d6326fda6a0
+  metadata.gz: 2dc603278c71448b73695d2b638ed17435b372546e2bd8f9fbde0f6df4f8f163
+  data.tar.gz: e22a233a3fe3e022ab35bf7cb6ab203b42dd4ab21be76fe178abe274b90c8bd3
 SHA512:
-  metadata.gz: 4f9490039ad57e392b9046dbae91b08e9be049f34ff3c1fa99c88b1d47041fcbec20d0e7bdbb927041fdf9853bf4b70524b9d0e9d9ac1b7dde9cd3bedff01099
-  data.tar.gz: 834d699ca69ec0541afdb9927ef15599b50e90bd23bc781691ad07e396ad4e8a275762823c82def5c6bcd80f429e6d1f21a8026f240610705688afdda3d645cc
+  metadata.gz: ca7f66ffd50b4040b5881aafe889d3c7e0d2fc18355c183822177736672e47e8059a0b04bc2af5b3cdef05760071afc5eb46172e65b063b3ff58175498f9943b
+  data.tar.gz: ac18f38d021188a0cac016096fe3c1b376cce05a4d4822a386ce8c5d8c5a63f1fdd352af6f24f0c159d73660aaf2062aa085927e84dba7e0be8656fe1ee15b62

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # sqlite3-ruby Changelog
 
+## 1.7.0 / 2023-12-27
+
+### Ruby
+
+This release introduces native gem support for Ruby 3.3.
+
+This release ends native gem support for Ruby 2.7, for which [upstream support ended 2023-03-31](https://www.ruby-lang.org/en/downloads/branches/). Ruby 2.7 is still generally supported, but will not be shipped in the native gems.
+
+This release ends support for Ruby 1.9.3, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, and 2.6.
+
+### Improved
+
+- SQLite3::Statement, Database, and Backup objects have been converted to use the TypedData API. See https://bugs.ruby-lang.org/issues/19998 for more context. [#432] @casperisfine
+
+
 ## 1.6.9 / 2023-11-26
 
 ### Dependencies

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 gem("minitest", "5.20.0")
 gem("rake-compiler", "1.2.5")
-gem("rake-compiler-dock", "1.3.1")
-gem("rdoc", "6.6.0")
+gem("rake-compiler-dock", "1.4.0")
+gem("rdoc", "6.6.2")
 
-gem("ruby_memcheck", "2.2.1") if Gem::Platform.local.os == "linux"
+gem("ruby_memcheck", "2.3.0") if Gem::Platform.local.os == "linux"

data/ext/sqlite3/aggregator.c

@@ -206,12 +206,11 @@ VALUE
 rb_sqlite3_define_aggregator2(VALUE self, VALUE aggregator, VALUE ruby_name)
 {
   /* define_aggregator is added as a method to SQLite3::Database in database.c */
-  sqlite3RubyPtr ctx;
+  sqlite3RubyPtr ctx = sqlite3_database_unwrap(self);
   int arity, status;
   VALUE aw;
   VALUE aggregators;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
   if (!ctx->db) {
     rb_raise(rb_path2class("SQLite3::Exception"), "cannot use a closed database");
   }

data/ext/sqlite3/backup.c

@@ -8,16 +8,29 @@
 
 VALUE cSqlite3Backup;
 
-static void deallocate(void * ctx)
+static size_t backup_memsize(const void *data)
 {
-  sqlite3BackupRubyPtr c = (sqlite3BackupRubyPtr)ctx;
-  xfree(c);
+  sqlite3BackupRubyPtr ctx = (sqlite3BackupRubyPtr)data;
+  // NB: can't account for ctx->p because the type is incomplete.
+  return sizeof(*ctx);
 }
 
+static const rb_data_type_t backup_type = {
+    "SQLite3::Backup",
+    {
+        NULL,
+        RUBY_TYPED_DEFAULT_FREE,
+        backup_memsize,
+    },
+    0,
+    0,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
 static VALUE allocate(VALUE klass)
 {
-  sqlite3BackupRubyPtr ctx = xcalloc((size_t)1, sizeof(sqlite3BackupRuby));
-  return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
+  sqlite3BackupRubyPtr ctx;
+  return TypedData_Make_Struct(klass, sqlite3BackupRuby, &backup_type, ctx);
 }
 
 /* call-seq: SQLite3::Backup.new(dstdb, dstname, srcdb, srcname)
@@ -62,9 +75,9 @@ static VALUE initialize(VALUE self, VALUE dstdb, VALUE dstname, VALUE srcdb, VAL
   sqlite3RubyPtr ddb_ctx, sdb_ctx;
   sqlite3_backup *pBackup;
 
-  Data_Get_Struct(self, sqlite3BackupRuby, ctx);
-  Data_Get_Struct(dstdb, sqlite3Ruby, ddb_ctx);
-  Data_Get_Struct(srcdb, sqlite3Ruby, sdb_ctx);
+  TypedData_Get_Struct(self, sqlite3BackupRuby, &backup_type, ctx);
+  ddb_ctx = sqlite3_database_unwrap(dstdb);
+  sdb_ctx = sqlite3_database_unwrap(srcdb);
 
   if(!sdb_ctx->db)
     rb_raise(rb_eArgError, "cannot backup from a closed database");
@@ -97,7 +110,7 @@ static VALUE step(VALUE self, VALUE nPage)
   sqlite3BackupRubyPtr ctx;
   int status;
 
-  Data_Get_Struct(self, sqlite3BackupRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3BackupRuby, &backup_type, ctx);
   REQUIRE_OPEN_BACKUP(ctx);
   status = sqlite3_backup_step(ctx->p, NUM2INT(nPage));
   return INT2NUM(status);
@@ -111,7 +124,7 @@ static VALUE finish(VALUE self)
 {
   sqlite3BackupRubyPtr ctx;
 
-  Data_Get_Struct(self, sqlite3BackupRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3BackupRuby, &backup_type, ctx);
   REQUIRE_OPEN_BACKUP(ctx);
   (void)sqlite3_backup_finish(ctx->p);
   ctx->p = NULL;
@@ -129,7 +142,7 @@ static VALUE remaining(VALUE self)
 {
   sqlite3BackupRubyPtr ctx;
 
-  Data_Get_Struct(self, sqlite3BackupRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3BackupRuby, &backup_type, ctx);
   REQUIRE_OPEN_BACKUP(ctx);
   return INT2NUM(sqlite3_backup_remaining(ctx->p));
 }
@@ -145,7 +158,7 @@ static VALUE pagecount(VALUE self)
 {
   sqlite3BackupRubyPtr ctx;
 
-  Data_Get_Struct(self, sqlite3BackupRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3BackupRuby, &backup_type, ctx);
   REQUIRE_OPEN_BACKUP(ctx);
   return INT2NUM(sqlite3_backup_pagecount(ctx->p));
 }

data/ext/sqlite3/database.c

@@ -21,10 +21,29 @@ static void deallocate(void * ctx)
   xfree(c);
 }
 
+static size_t database_memsize(const void *ctx)
+{
+  const sqlite3RubyPtr c = (const sqlite3RubyPtr)ctx;
+  // NB: can't account for ctx->db because the type is incomplete.
+  return sizeof(*c);
+}
+
+static const rb_data_type_t database_type = {
+  "SQLite3::Backup",
+  {
+      NULL,
+      deallocate,
+      database_memsize,
+  },
+  0,
+  0,
+  RUBY_TYPED_WB_PROTECTED, // Not freed immediately because the dfree function do IOs.
+};
+
 static VALUE allocate(VALUE klass)
 {
-  sqlite3RubyPtr ctx = xcalloc((size_t)1, sizeof(sqlite3Ruby));
-  return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
+  sqlite3RubyPtr ctx;
+  return TypedData_Make_Struct(klass, sqlite3Ruby, &database_type, ctx);
 }
 
 static char *
@@ -37,12 +56,18 @@ utf16_string_value_ptr(VALUE str)
 
 static VALUE sqlite3_rb_close(VALUE self);
 
+sqlite3RubyPtr sqlite3_database_unwrap(VALUE database){
+  sqlite3RubyPtr ctx;
+  TypedData_Get_Struct(database, sqlite3Ruby, &database_type, ctx);
+  return ctx;
+}
+
 static VALUE rb_sqlite3_open_v2(VALUE self, VALUE file, VALUE mode, VALUE zvfs)
 {
   sqlite3RubyPtr ctx;
   int status;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
 
 #if defined TAINTING_SUPPORT
 #  if defined StringValueCStr
@@ -69,7 +94,7 @@ static VALUE rb_sqlite3_disable_quirk_mode(VALUE self)
 {
 #if defined SQLITE_DBCONFIG_DQS_DDL
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
 
   if(!ctx->db) return Qfalse;
 
@@ -90,7 +115,7 @@ static VALUE sqlite3_rb_close(VALUE self)
 {
   sqlite3RubyPtr ctx;
   sqlite3 * db;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
 
   db = ctx->db;
   CHECK(db, sqlite3_close(ctx->db));
@@ -109,7 +134,7 @@ static VALUE sqlite3_rb_close(VALUE self)
 static VALUE closed_p(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
 
   if(!ctx->db) return Qtrue;
 
@@ -124,7 +149,7 @@ static VALUE closed_p(VALUE self)
 static VALUE total_changes(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   return INT2NUM(sqlite3_total_changes(ctx->db));
@@ -150,7 +175,7 @@ static VALUE trace(int argc, VALUE *argv, VALUE self)
   sqlite3RubyPtr ctx;
   VALUE block;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   rb_scan_args(argc, argv, "01", &block);
@@ -195,7 +220,7 @@ static VALUE busy_handler(int argc, VALUE *argv, VALUE self)
   VALUE block;
   int status;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   rb_scan_args(argc, argv, "01", &block);
@@ -220,7 +245,7 @@ static VALUE busy_handler(int argc, VALUE *argv, VALUE self)
 static VALUE last_insert_row_id(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   return LL2NUM(sqlite3_last_insert_rowid(ctx->db));
@@ -340,7 +365,7 @@ static VALUE define_function_with_flags(VALUE self, VALUE name, VALUE flags)
   VALUE block;
   int status;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   block = rb_block_proc();
@@ -380,7 +405,7 @@ static VALUE define_function(VALUE self, VALUE name)
 static VALUE interrupt(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   sqlite3_interrupt(ctx->db);
@@ -396,7 +421,7 @@ static VALUE interrupt(VALUE self)
 static VALUE errmsg(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   return rb_str_new2(sqlite3_errmsg(ctx->db));
@@ -410,7 +435,7 @@ static VALUE errmsg(VALUE self)
 static VALUE errcode_(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   return INT2NUM(sqlite3_errcode(ctx->db));
@@ -438,7 +463,7 @@ static VALUE complete_p(VALUE UNUSED(self), VALUE sql)
 static VALUE changes(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   return INT2NUM(sqlite3_changes(ctx->db));
@@ -483,7 +508,7 @@ static VALUE set_authorizer(VALUE self, VALUE authorizer)
   sqlite3RubyPtr ctx;
   int status;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   status = sqlite3_set_authorizer(
@@ -510,7 +535,7 @@ static VALUE set_authorizer(VALUE self, VALUE authorizer)
 static VALUE set_busy_timeout(VALUE self, VALUE timeout)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   CHECK(ctx->db, sqlite3_busy_timeout(ctx->db, (int)NUM2INT(timeout)));
@@ -526,7 +551,7 @@ static VALUE set_busy_timeout(VALUE self, VALUE timeout)
 static VALUE set_extended_result_codes(VALUE self, VALUE enable)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   CHECK(ctx->db, sqlite3_extended_result_codes(ctx->db, RTEST(enable) ? 1 : 0));
@@ -571,7 +596,7 @@ int rb_comparator_func(void * ctx, int a_len, const void * a, int b_len, const v
 static VALUE collation(VALUE self, VALUE name, VALUE comparator)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   CHECK(ctx->db, sqlite3_create_collation(
@@ -600,7 +625,7 @@ static VALUE load_extension(VALUE self, VALUE file)
   int status;
   char *errMsg;
   VALUE errexp;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   status = sqlite3_load_extension(ctx->db, StringValuePtr(file), 0, &errMsg);
@@ -624,7 +649,7 @@ static VALUE enable_load_extension(VALUE self, VALUE onoff)
 {
   sqlite3RubyPtr ctx;
   int onoffparam;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   if (Qtrue == onoff) {
@@ -661,7 +686,7 @@ static VALUE db_encoding(VALUE self)
   sqlite3RubyPtr ctx;
   VALUE enc;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   enc = rb_iv_get(self, "@encoding");
@@ -681,7 +706,7 @@ static VALUE db_encoding(VALUE self)
 static VALUE transaction_active_p(VALUE self)
 {
   sqlite3RubyPtr ctx;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   return sqlite3_get_autocommit(ctx->db) ? Qfalse : Qtrue;
@@ -740,7 +765,7 @@ static VALUE exec_batch(VALUE self, VALUE sql, VALUE results_as_hash)
   char *errMsg;
   VALUE errexp;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   if(results_as_hash == Qtrue) {
@@ -768,7 +793,7 @@ static VALUE db_filename(VALUE self, VALUE db_name)
 {
   sqlite3RubyPtr ctx;
   const char * fname;
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
   REQUIRE_OPEN_DB(ctx);
 
   fname = sqlite3_db_filename(ctx->db, StringValueCStr(db_name));
@@ -782,7 +807,7 @@ static VALUE rb_sqlite3_open16(VALUE self, VALUE file)
   int status;
   sqlite3RubyPtr ctx;
 
-  Data_Get_Struct(self, sqlite3Ruby, ctx);
+  TypedData_Get_Struct(self, sqlite3Ruby, &database_type, ctx);
 
 #if defined TAINTING_SUPPORT
 #if defined StringValueCStr

data/ext/sqlite3/database.h

@@ -12,6 +12,8 @@ typedef sqlite3Ruby * sqlite3RubyPtr;
 
 void init_sqlite3_database();
 void set_sqlite3_func_result(sqlite3_context * ctx, VALUE result);
+
+sqlite3RubyPtr sqlite3_database_unwrap(VALUE database);
 VALUE sqlite3val2rb(sqlite3_value * val);
 
 #endif

data/ext/sqlite3/statement.c

@@ -6,19 +6,29 @@
 
 VALUE cSqlite3Statement;
 
-static void deallocate(void * ctx)
+static size_t statement_memsize(const void *data)
 {
-  sqlite3StmtRubyPtr c = (sqlite3StmtRubyPtr)ctx;
-  xfree(c);
+  const sqlite3StmtRubyPtr s = (const sqlite3StmtRubyPtr)data;
+  // NB: can't account for s->st because the type is incomplete.
+  return sizeof(*s);
 }
 
+static const rb_data_type_t statement_type = {
+  "SQLite3::Backup",
+  {
+      NULL,
+      RUBY_TYPED_DEFAULT_FREE,
+      statement_memsize,
+  },
+  0,
+  0,
+  RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
 static VALUE allocate(VALUE klass)
 {
-  sqlite3StmtRubyPtr ctx = xcalloc((size_t)1, sizeof(sqlite3StmtRuby));
-  ctx->st     = NULL;
-  ctx->done_p = 0;
-
-  return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
+  sqlite3StmtRubyPtr ctx;
+  return TypedData_Make_Struct(klass, sqlite3StmtRuby, &statement_type, ctx);
 }
 
 /* call-seq: SQLite3::Statement.new(db, sql)
@@ -30,15 +40,14 @@ static VALUE allocate(VALUE klass)
  */
 static VALUE initialize(VALUE self, VALUE db, VALUE sql)
 {
-  sqlite3RubyPtr db_ctx;
+  sqlite3RubyPtr db_ctx = sqlite3_database_unwrap(db);
   sqlite3StmtRubyPtr ctx;
   const char *tail = NULL;
   int status;
 
   StringValue(sql);
 
-  Data_Get_Struct(db, sqlite3Ruby, db_ctx);
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
   if(!db_ctx->db)
     rb_raise(rb_eArgError, "prepare called on a closed database");
@@ -78,7 +87,7 @@ static VALUE sqlite3_rb_close(VALUE self)
 {
   sqlite3StmtRubyPtr ctx;
 
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
   REQUIRE_OPEN_STMT(ctx);
 
@@ -95,7 +104,7 @@ static VALUE sqlite3_rb_close(VALUE self)
 static VALUE closed_p(VALUE self)
 {
   sqlite3StmtRubyPtr ctx;
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
   if(!ctx->st) return Qtrue;
 
@@ -110,7 +119,7 @@ static VALUE step(VALUE self)
   VALUE list;
   rb_encoding * internal_encoding;
 
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
   REQUIRE_OPEN_STMT(ctx);
 
@@ -206,7 +215,7 @@ static VALUE bind_param(VALUE self, VALUE key, VALUE value)
   int status;
   int index;
 
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
   REQUIRE_OPEN_STMT(ctx);
 
   switch(TYPE(key)) {
@@ -296,7 +305,7 @@ static VALUE reset_bang(VALUE self)
 {
   sqlite3StmtRubyPtr ctx;
 
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
   REQUIRE_OPEN_STMT(ctx);
 
   sqlite3_reset(ctx->st);
@@ -315,7 +324,7 @@ static VALUE clear_bindings_bang(VALUE self)
 {
   sqlite3StmtRubyPtr ctx;
 
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
   REQUIRE_OPEN_STMT(ctx);
 
   sqlite3_clear_bindings(ctx->st);
@@ -332,7 +341,7 @@ static VALUE clear_bindings_bang(VALUE self)
 static VALUE done_p(VALUE self)
 {
   sqlite3StmtRubyPtr ctx;
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
 
   if(ctx->done_p) return Qtrue;
   return Qfalse;
@@ -345,7 +354,7 @@ static VALUE done_p(VALUE self)
 static VALUE column_count(VALUE self)
 {
   sqlite3StmtRubyPtr ctx;
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
   REQUIRE_OPEN_STMT(ctx);
 
   return INT2NUM(sqlite3_column_count(ctx->st));
@@ -360,7 +369,7 @@ static VALUE column_name(VALUE self, VALUE index)
   sqlite3StmtRubyPtr ctx;
   const char * name;
 
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
   REQUIRE_OPEN_STMT(ctx);
 
   name = sqlite3_column_name(ctx->st, (int)NUM2INT(index));
@@ -378,7 +387,7 @@ static VALUE column_decltype(VALUE self, VALUE index)
   sqlite3StmtRubyPtr ctx;
   const char * name;
 
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
   REQUIRE_OPEN_STMT(ctx);
 
   name = sqlite3_column_decltype(ctx->st, (int)NUM2INT(index));
@@ -394,7 +403,7 @@ static VALUE column_decltype(VALUE self, VALUE index)
 static VALUE bind_parameter_count(VALUE self)
 {
   sqlite3StmtRubyPtr ctx;
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
   REQUIRE_OPEN_STMT(ctx);
 
   return INT2NUM(sqlite3_bind_parameter_count(ctx->st));
@@ -409,7 +418,7 @@ static VALUE bind_parameter_count(VALUE self)
 static VALUE database_name(VALUE self, VALUE index)
 {
   sqlite3StmtRubyPtr ctx;
-  Data_Get_Struct(self, sqlite3StmtRuby, ctx);
+  TypedData_Get_Struct(self, sqlite3StmtRuby, &statement_type, ctx);
   REQUIRE_OPEN_STMT(ctx);
 
   return SQLITE3_UTF8_STR_NEW2(

data/lib/sqlite3/version.rb

@@ -1,11 +1,11 @@
 module SQLite3
 
-  VERSION = "1.6.9"
+  VERSION = "1.7.0"
 
   module VersionProxy
     MAJOR = 1
-    MINOR = 6
-    TINY  = 9
+    MINOR = 7
+    TINY  = 0
     BUILD = nil
 
     STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.7.0
 platform: arm64-darwin
 authors:
 - Jamis Buck
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-26 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies: []
 description: |
   Ruby library to interface with the SQLite3 database engine (http://www.sqlite.org). Precompiled
@@ -56,10 +56,10 @@ files:
 - ext/sqlite3/statement.c
 - ext/sqlite3/statement.h
 - lib/sqlite3.rb
-- lib/sqlite3/2.7/sqlite3_native.bundle
 - lib/sqlite3/3.0/sqlite3_native.bundle
 - lib/sqlite3/3.1/sqlite3_native.bundle
 - lib/sqlite3/3.2/sqlite3_native.bundle
+- lib/sqlite3/3.3/sqlite3_native.bundle
 - lib/sqlite3/constants.rb
 - lib/sqlite3/database.rb
 - lib/sqlite3/errors.rb
@@ -109,10 +109,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.3.dev
+      version: 3.4.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="