duckdb 0.3.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09a5bd2bc1a410ea68f8a3d0656c60c7048e24bbfc6406b1da5b51e3593a35e8'
-  data.tar.gz: 66cf129bde28b1473254d974bab4090cb738c01e7e0870b511bae82adaa9a2c3
+  metadata.gz: fb0ae46a8621f1ea98471f78e708c0a164af484accf51b46d629cce1298f2cd4
+  data.tar.gz: 5f83eb6e97eefe61d8f2be889269b777717fac860d39cab28475aeb5719bcec9
 SHA512:
-  metadata.gz: 651bc7aa40359762327e1f4f104662808a2d6c9c2bfef4aadbe3707a2f2a824bff50d8c21d302549c69e5ebd26f9a32cba457015a2903eeba85adf1487b73e43
-  data.tar.gz: e36ce93b343c03daff66023fc3971379ccbcfa2488c1f23b028ef18b905d62d3ca6619e389e0619e50b958015f9330a508b27e6263458b28694a78bd3c9c0b98
+  metadata.gz: c908703791872e519310118d53b16a8b855518bff749b00ec6538858e0ec1664586a799921fd84cd2d334ef4f2b3b384a632f476e0b61c84b6392deb9b0ff89d
+  data.tar.gz: f83106674968f42a0d8ef7bb8cdee42c6124fbc10b5576faca26832e968ba7e7cca42f82fb74dd1fdb3482f4d3f27b9b3ca326e1f655a4841fb70e40e43cc987

data/.github/workflows/test_on_macos.yml

@@ -11,12 +11,12 @@ on:
       - reopened
 
 jobs:
-  build:
+  test:
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: ['2.6.10', '2.7.6', '3.0.4', '3.1.2', 'head']
-        duckdb: ['0.3.2', '0.3.4']
+        ruby: ['2.6.10', '2.7.6', '3.0.4', '3.1.2', '3.2.0-preview2', 'head']
+        duckdb: ['0.5.1', '0.5.0']
 
     steps:
     - uses: actions/checkout@v2
@@ -57,3 +57,10 @@ jobs:
         ruby -v
         bundle install --jobs 4 --retry 3
         bundle exec rake
+
+  post-test:
+    name: All tests passed on macos
+    runs-on: macos-latest
+    needs: test
+    steps:
+      - run: echo ok

data/.github/workflows/test_on_ubuntu.yml

@@ -11,13 +11,12 @@ on:
       - reopened
 
 jobs:
-  build:
-
+  test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.6.10', '2.7.6', '3.0.4', '3.1.2', 'head']
-        duckdb: ['0.3.2', '0.3.4']
+        ruby: ['2.6.10', '2.7.6', '3.0.4', '3.1.2', '3.2.0-preview2', 'head']
+        duckdb: ['0.5.1', '0.5.0']
 
     steps:
     - uses: actions/checkout@v2
@@ -53,3 +52,10 @@ jobs:
         gem install bundler
         bundle install --jobs 4 --retry 3
         bundle exec rake -- --with-duckdb-include=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/src/include --with-duckdb-lib=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/build/release/src/
+
+  post-test:
+    name: All tests passed on Ubuntu
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - run: echo ok

data/.github/workflows/test_on_windows.yml

@@ -11,12 +11,12 @@ on:
       - reopened
 
 jobs:
-  build:
+  test:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: ['2.6.10', '2.7.6', '3.0.4', '3.1.2', 'mingw', 'head']
-        duckdb: ['0.3.2', '0.3.4']
+        ruby: ['2.6.10', '2.7.6', '3.0.4', '3.1.2', 'ucrt', 'mingw', 'head']
+        duckdb: ['0.5.1', '0.5.0']
 
     steps:
     - uses: actions/checkout@v2
@@ -48,3 +48,10 @@ jobs:
     - name: rake test
       run: |
         rake test
+
+  post-test:
+    name: All tests passed on Windows
+    runs-on: windows-latest
+    needs: test
+    steps:
+      - run: echo ok

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # ChangeLog
 
+# 0.5.1
+- bump duckdb 0.5.1
+
+# 0.5.0
+- update bundle version of Gemfile.lock
+- add ruby ucrt test on Windows
+- use TypedData_Wrap_Struct, TypedData_Get_Struct
+- bump duckdb 0.5.0
+- fix utf-8 encoding.
+- add DuckDB::Result#enum_dictionary_values
+- add DuckDB::Result#row_count, DuckDB::Result#row_size(alias of row_count).
+- add DuckDB::Result#column_count, DuckDB::Result#column_size(alias of column_count).
+
+## Breaking Change
+- bind_varchar does not raised DuckDB::Error when the binding column is date or datetime.
+
 # 0.3.4.0
 - bump duckdb 0.3.4
 

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    duckdb (0.3.4.0)
+    duckdb (0.5.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.15.0)
+    minitest (5.16.3)
     rake (13.0.6)
     rake-compiler (1.2.0)
       rake
@@ -16,11 +16,11 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 2.0)
+  bundler (~> 2.3)
   duckdb!
   minitest (~> 5.0)
   rake (~> 13.0)
   rake-compiler
 
 BUNDLED WITH
-   2.2.25
+   2.3.22

data/README.md

@@ -21,14 +21,14 @@ You must have [DuckDB](http://www.duckdb.org) engine installed in order to build
 3. Move the files to their respective location:
     - Extract the `duckdb.h` and `duckdb.hpp` file to `/usr/local/include`
     - Extract the `libduckdb.so` file to `/usr/local/lib`
-    
+
     ```sh
     unzip libduckdb-linux-amd64.zip -d libduckdb
     sudo mv libduckdb/duckdb.* /usr/local/include/
     sudo mv libduckdb/libduckdb.so /usr/local/lib
     ```
 4. To create the necessary link, run `ldconfig` as root:
-  
+
     ```sh
     sudo ldconfig /usr/local/lib # adding a --verbose flag is optional - but this will let you know if the libduckdb.so library has been linked
     ```
@@ -42,20 +42,20 @@ brew install duckdb
 
 ## How to Install
 
-```
+```sh
 gem install duckdb
 ```
 > this will work fine with the above pre-requisite setup.
 
 or you must specify the location of the C header and library files:
 
-```
+```sh
 gem install duckdb -- --with-duckdb-include=/duckdb_header_directory --with-duckdb-lib=/duckdb_library_directory
 ```
 
 ## Usage
 
-```
+```ruby
 require 'duckdb'
 
 db = DuckDB::Database.open # database in memory
@@ -75,7 +75,7 @@ end
 
 Or, you can use block.
 
-```
+```ruby
 require 'duckdb'
 
 DuckDB::Database.open do |db|
@@ -99,7 +99,7 @@ end
 BLOB is available with DuckDB v0.2.5 or later.
 Use `DuckDB::Blob.new` or use sting#force_encoding(Encoding::BINARY)
 
-```
+```ruby
 require 'duckdb'
 
 DuckDB::Database.open do |db|
@@ -121,7 +121,7 @@ end
 
 Appender class provides Ruby interface of [DuckDB Appender](https://duckdb.org/docs/data/appender)
 
-```
+```ruby
 require 'duckdb'
 require 'benchmark'
 
@@ -183,7 +183,7 @@ end
 
 Config class provides Ruby interface of [DuckDB configuration](https://duckdb.org/docs/api/c/config).
 
-```
+```ruby
 require 'duckdb'
 config = DuckDB::Config.new
 config['default_order'] = 'DESC'

data/duckdb.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.extensions    = ['ext/duckdb/extconf.rb']
   spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'bundler', '~> 2.3'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rake-compiler'

data/ext/duckdb/appender.c

@@ -4,6 +4,7 @@ static VALUE cDuckDBAppender;
 
 static void deallocate(void *);
 static VALUE allocate(VALUE klass);
+static size_t memsize(const void *p);
 static VALUE appender_initialize(VALUE klass, VALUE con, VALUE schema, VALUE table);
 static VALUE appender_begin_row(VALUE self);
 static VALUE appender_end_row(VALUE self);
@@ -22,20 +23,20 @@ static VALUE appender_append_varchar(VALUE self, VALUE val);
 static VALUE appender_append_varchar_length(VALUE self, VALUE val, VALUE len);
 static VALUE appender_append_blob(VALUE self, VALUE val);
 static VALUE appender_append_null(VALUE self);
-
-#ifdef HAVE_DUCKDB_APPEND_DATE
 static VALUE appender__append_date(VALUE self, VALUE yearval, VALUE monthval, VALUE dayval);
-#endif
-
 static VALUE appender__append_interval(VALUE self, VALUE months, VALUE days, VALUE micros);
-
 static VALUE appender__append_time(VALUE self, VALUE hour, VALUE min, VALUE sec, VALUE micros);
 static VALUE appender__append_timestamp(VALUE self, VALUE year, VALUE month, VALUE day, VALUE hour, VALUE min, VALUE sec, VALUE micros);
 static VALUE appender__append_hugeint(VALUE self, VALUE lower, VALUE upper);
-
 static VALUE appender_flush(VALUE self);
 static VALUE appender_close(VALUE self);
 
+static const rb_data_type_t appender_data_type = {
+    "DuckDB/Appender",
+    {NULL, deallocate, memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static void deallocate(void * ctx) {
     rubyDuckDBAppender *p = (rubyDuckDBAppender *)ctx;
 
@@ -45,7 +46,11 @@ static void deallocate(void * ctx) {
 
 static VALUE allocate(VALUE klass) {
     rubyDuckDBAppender *ctx = xcalloc((size_t)1, sizeof(rubyDuckDBAppender));
-    return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
+    return TypedData_Wrap_Struct(klass, &appender_data_type, ctx);
+}
+
+static size_t memsize(const void *p) {
+    return sizeof(rubyDuckDBAppender);
 }
 
 static VALUE appender_initialize(VALUE self, VALUE con, VALUE schema, VALUE table) {
@@ -58,8 +63,8 @@ static VALUE appender_initialize(VALUE self, VALUE con, VALUE schema, VALUE tabl
         rb_raise(rb_eTypeError, "1st argument should be instance of DackDB::Connection");
     }
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
-    Data_Get_Struct(con, rubyDuckDBConnection, ctxcon);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
+    ctxcon = get_struct_connection(con);
 
     if (schema != Qnil) {
         pschema = StringValuePtr(schema);
@@ -73,7 +78,7 @@ static VALUE appender_initialize(VALUE self, VALUE con, VALUE schema, VALUE tabl
 
 static VALUE appender_begin_row(VALUE self) {
     rubyDuckDBAppender *ctx;
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_appender_begin_row(ctx->appender) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to flush");
@@ -83,7 +88,7 @@ static VALUE appender_begin_row(VALUE self) {
 
 static VALUE appender_end_row(VALUE self) {
     rubyDuckDBAppender *ctx;
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_appender_end_row(ctx->appender) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to flush");
@@ -93,7 +98,7 @@ static VALUE appender_end_row(VALUE self) {
 
 static VALUE appender_append_bool(VALUE self, VALUE val) {
     rubyDuckDBAppender *ctx;
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (val != Qtrue && val != Qfalse) {
         rb_raise(rb_eArgError, "argument must be boolean");
@@ -109,7 +114,7 @@ static VALUE appender_append_int8(VALUE self, VALUE val) {
     rubyDuckDBAppender *ctx;
     int8_t i8val = (int8_t)NUM2INT(val);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_int8(ctx->appender, i8val) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -121,7 +126,7 @@ static VALUE appender_append_int16(VALUE self, VALUE val) {
     rubyDuckDBAppender *ctx;
     int16_t i16val = (int16_t)NUM2INT(val);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_int16(ctx->appender, i16val) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -133,7 +138,7 @@ static VALUE appender_append_int32(VALUE self, VALUE val) {
     rubyDuckDBAppender *ctx;
     int32_t i32val = (int32_t)NUM2INT(val);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_int32(ctx->appender, i32val) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -145,7 +150,7 @@ static VALUE appender_append_int64(VALUE self, VALUE val) {
     rubyDuckDBAppender *ctx;
     int64_t i64val = (int64_t)NUM2LL(val);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_int64(ctx->appender, i64val) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -157,7 +162,7 @@ static VALUE appender_append_uint8(VALUE self, VALUE val) {
     rubyDuckDBAppender *ctx;
     int8_t ui8val = (uint8_t)NUM2UINT(val);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_uint8(ctx->appender, ui8val) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -169,7 +174,7 @@ static VALUE appender_append_uint16(VALUE self, VALUE val) {
     rubyDuckDBAppender *ctx;
     uint16_t ui16val = (uint16_t)NUM2UINT(val);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_uint16(ctx->appender, ui16val) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -181,7 +186,7 @@ static VALUE appender_append_uint32(VALUE self, VALUE val) {
     rubyDuckDBAppender *ctx;
     uint32_t ui32val = (uint32_t)NUM2UINT(val);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_uint32(ctx->appender, ui32val) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -193,7 +198,7 @@ static VALUE appender_append_uint64(VALUE self, VALUE val) {
     rubyDuckDBAppender *ctx;
     uint64_t ui64val = (uint64_t)NUM2ULL(val);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_uint64(ctx->appender, ui64val) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -205,7 +210,7 @@ static VALUE appender_append_float(VALUE self, VALUE val) {
     rubyDuckDBAppender *ctx;
     float fval = (float)NUM2DBL(val);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_float(ctx->appender, fval) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -217,7 +222,7 @@ static VALUE appender_append_double(VALUE self, VALUE val) {
     rubyDuckDBAppender *ctx;
     double dval = NUM2DBL(val);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_double(ctx->appender, dval) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -229,7 +234,7 @@ static VALUE appender_append_varchar(VALUE self, VALUE val) {
     rubyDuckDBAppender *ctx;
     char *pval = StringValuePtr(val);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_varchar(ctx->appender, pval) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -243,7 +248,7 @@ static VALUE appender_append_varchar_length(VALUE self, VALUE val, VALUE len) {
     char *pval = StringValuePtr(val);
     idx_t length = (idx_t)NUM2ULL(len);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_varchar_length(ctx->appender, pval, length) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -257,7 +262,7 @@ static VALUE appender_append_blob(VALUE self, VALUE val) {
     char *pval = StringValuePtr(val);
     idx_t length = (idx_t)RSTRING_LEN(val);
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_blob(ctx->appender, (void *)pval, length) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -267,7 +272,7 @@ static VALUE appender_append_blob(VALUE self, VALUE val) {
 
 static VALUE appender_append_null(VALUE self) {
     rubyDuckDBAppender *ctx;
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_append_null(ctx->appender) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append");
@@ -275,12 +280,11 @@ static VALUE appender_append_null(VALUE self) {
     return self;
 }
 
-#ifdef HAVE_DUCKDB_APPEND_DATE
 static VALUE appender__append_date(VALUE self, VALUE year, VALUE month, VALUE day) {
     duckdb_date dt;
     rubyDuckDBAppender *ctx;
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
     dt = to_duckdb_date_from_value(year, month, day);
 
     if (duckdb_append_date(ctx->appender, dt) == DuckDBError) {
@@ -288,13 +292,12 @@ static VALUE appender__append_date(VALUE self, VALUE year, VALUE month, VALUE da
     }
     return self;
 }
-#endif
 
 static VALUE appender__append_interval(VALUE self, VALUE months, VALUE days, VALUE micros) {
     duckdb_interval interval;
     rubyDuckDBAppender *ctx;
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
     to_duckdb_interval_from_value(&interval, months, days, micros);
 
     if (duckdb_append_interval(ctx->appender, interval) == DuckDBError) {
@@ -307,7 +310,7 @@ static VALUE appender__append_time(VALUE self, VALUE hour, VALUE min, VALUE sec,
     duckdb_time time;
     rubyDuckDBAppender *ctx;
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
     time = to_duckdb_time_from_value(hour, min, sec, micros);
 
     if (duckdb_append_time(ctx->appender, time) == DuckDBError) {
@@ -321,7 +324,7 @@ static VALUE appender__append_timestamp(VALUE self, VALUE year, VALUE month, VAL
 
     rubyDuckDBAppender *ctx;
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     timestamp = to_duckdb_timestamp_from_value(year, month, day, hour, min, sec, micros);
 
@@ -339,7 +342,7 @@ static VALUE appender__append_hugeint(VALUE self, VALUE lower, VALUE upper) {
 
     rubyDuckDBAppender *ctx;
 
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
     if (duckdb_append_hugeint(ctx->appender, hugeint) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to append hugeint");
     }
@@ -348,7 +351,7 @@ static VALUE appender__append_hugeint(VALUE self, VALUE lower, VALUE upper) {
 
 static VALUE appender_flush(VALUE self) {
     rubyDuckDBAppender *ctx;
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_appender_flush(ctx->appender) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to flush");
@@ -358,7 +361,7 @@ static VALUE appender_flush(VALUE self) {
 
 static VALUE appender_close(VALUE self) {
     rubyDuckDBAppender *ctx;
-    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
 
     if (duckdb_appender_close(ctx->appender) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to flush");
@@ -387,9 +390,7 @@ void init_duckdb_appender(void) {
     rb_define_method(cDuckDBAppender, "append_varchar_length", appender_append_varchar_length, 2);
     rb_define_method(cDuckDBAppender, "append_blob", appender_append_blob, 1);
     rb_define_method(cDuckDBAppender, "append_null", appender_append_null, 0);
-#ifdef HAVE_DUCKDB_APPEND_DATE
     rb_define_private_method(cDuckDBAppender, "_append_date", appender__append_date, 3);
-#endif
     rb_define_private_method(cDuckDBAppender, "_append_interval", appender__append_interval, 3);
     rb_define_private_method(cDuckDBAppender, "_append_time", appender__append_time, 4);
     rb_define_private_method(cDuckDBAppender, "_append_timestamp", appender__append_timestamp, 7);

data/ext/duckdb/column.c

@@ -4,9 +4,16 @@ static VALUE cDuckDBColumn;
 
 static void deallocate(void *ctx);
 static VALUE allocate(VALUE klass);
+static size_t memsize(const void *p);
 static VALUE duckdb_column__type(VALUE oDuckDBColumn);
 static VALUE duckdb_column_get_name(VALUE oDuckDBColumn);
 
+static const rb_data_type_t column_data_type = {
+    "DuckDB/Column",
+    {NULL, deallocate, memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static void deallocate(void *ctx) {
     rubyDuckDBColumn *p = (rubyDuckDBColumn *)ctx;
 
@@ -15,7 +22,11 @@ static void deallocate(void *ctx) {
 
 static VALUE allocate(VALUE klass) {
     rubyDuckDBColumn *ctx = xcalloc((size_t)1, sizeof(rubyDuckDBColumn));
-    return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
+    return TypedData_Wrap_Struct(klass, &column_data_type, ctx);
+}
+
+static size_t memsize(const void *p) {
+    return sizeof(rubyDuckDBColumn);
 }
 
 /*
@@ -23,12 +34,15 @@ static VALUE allocate(VALUE klass) {
  */
 VALUE duckdb_column__type(VALUE oDuckDBColumn) {
     rubyDuckDBColumn *ctx;
-    Data_Get_Struct(oDuckDBColumn, rubyDuckDBColumn, ctx);
-
-    VALUE result = rb_ivar_get(oDuckDBColumn, rb_intern("result"));
     rubyDuckDBResult *ctxresult;
-    Data_Get_Struct(result, rubyDuckDBResult, ctxresult);
-    duckdb_type type = duckdb_column_type(&(ctxresult->result), ctx->col);
+    VALUE result;
+    duckdb_type type;
+
+    TypedData_Get_Struct(oDuckDBColumn, rubyDuckDBColumn, &column_data_type, ctx);
+
+    result = rb_ivar_get(oDuckDBColumn, rb_intern("result"));
+    ctxresult = get_struct_result(result);
+    type = duckdb_column_type(&(ctxresult->result), ctx->col);
 
     return INT2FIX(type);
 }
@@ -42,21 +56,24 @@ VALUE duckdb_column__type(VALUE oDuckDBColumn) {
  */
 VALUE duckdb_column_get_name(VALUE oDuckDBColumn) {
     rubyDuckDBColumn *ctx;
-    Data_Get_Struct(oDuckDBColumn, rubyDuckDBColumn, ctx);
-
-    VALUE result = rb_ivar_get(oDuckDBColumn, rb_intern("result"));
+    VALUE result;
     rubyDuckDBResult *ctxresult;
-    Data_Get_Struct(result, rubyDuckDBResult, ctxresult);
 
-    return rb_str_new2(duckdb_column_name(&(ctxresult->result), ctx->col));
+    TypedData_Get_Struct(oDuckDBColumn, rubyDuckDBColumn, &column_data_type, ctx);
+
+    result = rb_ivar_get(oDuckDBColumn, rb_intern("result"));
+
+    ctxresult = get_struct_result(result);
+
+    return rb_utf8_str_new_cstr(duckdb_column_name(&(ctxresult->result), ctx->col));
 }
 
 VALUE create_column(VALUE oDuckDBResult, idx_t col) {
     VALUE obj;
+    rubyDuckDBColumn *ctx;
 
     obj = allocate(cDuckDBColumn);
-    rubyDuckDBColumn *ctx;
-    Data_Get_Struct(obj, rubyDuckDBColumn, ctx);
+    TypedData_Get_Struct(obj, rubyDuckDBColumn, &column_data_type, ctx);
 
     rb_ivar_set(obj, rb_intern("result"), oDuckDBResult);
     ctx->col = col;

data/ext/duckdb/config.c

@@ -1,16 +1,21 @@
 #include "ruby-duckdb.h"
 
-#ifdef HAVE_DUCKDB_CREATE_CONFIG
-
 VALUE cDuckDBConfig;
 
 static void deallocate(void *);
 static VALUE allocate(VALUE klass);
+static size_t memsize(const void *p);
 static VALUE config_s_size(VALUE klass);
 static VALUE config_s_get_config_flag(VALUE self, VALUE value);
 static VALUE config_initialize(VALUE self);
 static VALUE config_set_config(VALUE self, VALUE key, VALUE value);
 
+static const rb_data_type_t config_data_type = {
+    "DuckDB/Config",
+    {NULL, deallocate, memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static void deallocate(void * ctx) {
     rubyDuckDBConfig *p = (rubyDuckDBConfig *)ctx;
 
@@ -20,13 +25,23 @@ static void deallocate(void * ctx) {
 
 static VALUE allocate(VALUE klass) {
     rubyDuckDBConfig *ctx = xcalloc((size_t)1, sizeof(rubyDuckDBConfig));
-    return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
+    return TypedData_Wrap_Struct(klass, &config_data_type, ctx);
+}
+
+static size_t memsize(const void *p) {
+    return sizeof(rubyDuckDBConfig);
+}
+
+rubyDuckDBConfig *get_struct_config(VALUE obj) {
+    rubyDuckDBConfig *ctx;
+    TypedData_Get_Struct(obj, rubyDuckDBConfig, &config_data_type, ctx);
+    return ctx;
 }
 
 static VALUE config_initialize(VALUE self) {
     rubyDuckDBConfig *ctx;
 
-    Data_Get_Struct(self, rubyDuckDBConfig, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBConfig, &config_data_type, ctx);
 
     if (duckdb_create_config(&(ctx->config)) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to create config");
@@ -48,7 +63,7 @@ static VALUE config_s_get_config_flag(VALUE klass, VALUE value) {
         rb_raise(eDuckDBError, "failed to get config information of index %ld", i);
     }
 
-    return rb_ary_new3(2, rb_str_new2(pkey), rb_str_new2(pdesc));
+    return rb_ary_new3(2, rb_utf8_str_new_cstr(pkey), rb_utf8_str_new_cstr(pdesc));
 }
 
 static VALUE config_set_config(VALUE self, VALUE key, VALUE value) {
@@ -56,7 +71,7 @@ static VALUE config_set_config(VALUE self, VALUE key, VALUE value) {
     const char *pval = StringValuePtr(value);
 
     rubyDuckDBConfig *ctx;
-    Data_Get_Struct(self, rubyDuckDBConfig, ctx);
+    TypedData_Get_Struct(self, rubyDuckDBConfig, &config_data_type, ctx);
 
     if (duckdb_set_config(ctx->config, pkey, pval) == DuckDBError) {
         rb_raise(eDuckDBError, "failed to set config %s => %s", pkey, pval);
@@ -73,6 +88,3 @@ void init_duckdb_config(void) {
     rb_define_method(cDuckDBConfig, "initialize", config_initialize, 0);
     rb_define_method(cDuckDBConfig, "set_config", config_set_config, 2);
 }
-
-#endif
-