duckdb 0.5.1.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5490148631798723186b5440e514abb7e4969b3364777cc3f065a0d1b0aba08e
-  data.tar.gz: 18c3c6ec97ba3f72ce1dc9251c084ea56ad889734d759b0e73caee93a86a7390
+  metadata.gz: 9967f34d6c3a9f9d30fc9c406043230d86ffe98d0ca5cf55e74a547f6877b756
+  data.tar.gz: e28bce3d7b8410ceff6da630aaa54eab4d345bfab16748f9150dfef6e3836bfe
 SHA512:
-  metadata.gz: 457636af582f3850bd46d145f59783df209c7a7c170ce4f721f4999df4e43d6e580f39f43a92836b179d230afeae05e2e73ca3bcbee8b709680bb6c7b2ffc2f0
-  data.tar.gz: e62d2629728f47909118eaad24bd78032f4baa09f541464f5605c9309fb1cd71eb7a24ea8ca9ebb78a56d0081d9d2586b1a02ee4dcf50ba8b5ed3ca2eb92a2ad
+  metadata.gz: 834d11017be58ad60d8f8d8600e22f7e97dbac4ef2789921d2da8f76487e7df3c60a7458ece7e7d5f3fb7d1aca3bcf178557968131673055c2bf2d932bc982d6
+  data.tar.gz: f63d824d611095b857310f6f2f1c432d0129be7bbc3d03cb339baf938bd00c43e7911689b988494e4613f4199abf72a1b08c022d7adac26cc29f2e13ecd49883

data/.github/workflows/test_on_macos.yml

@@ -15,11 +15,11 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        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']
+        ruby: ['2.6.10', '2.7.7', '3.0.5', '3.1.3', '3.2.0', 'head']
+        duckdb: ['0.5.1', '0.6.1']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
@@ -28,7 +28,7 @@ jobs:
 
     - name: duckdb cache
       id: duckdb-cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: duckdb-v${{ matrix.duckdb }}
         key: ${{ runner.os }}-duckdb-v${{ matrix.duckdb }}

data/.github/workflows/test_on_ubuntu.yml

@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        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']
+        ruby: ['2.6.10', '2.7.7', '3.0.5', '3.1.3', '3.2.0', 'head']
+        duckdb: ['0.5.1', '0.6.1']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
@@ -28,7 +28,7 @@ jobs:
 
     - name: duckdb cache
       id: duckdb-cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: duckdb-v${{ matrix.duckdb }}
         key: ${{ runner.os }}-duckdb-v${{ matrix.duckdb }}

data/.github/workflows/test_on_windows.yml

@@ -16,10 +16,10 @@ jobs:
     strategy:
       matrix:
         ruby: ['2.6.10', '2.7.6', '3.0.4', '3.1.2', 'ucrt', 'mingw', 'head']
-        duckdb: ['0.5.1', '0.5.0']
+        duckdb: ['0.5.1', '0.6.1']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,16 +1,30 @@
 # ChangeLog
 
+# 0.6.1
+- bump Ruby to 3.2.0 on CI
+- fix deprected warning (double_heap is deprecated in GC.verify_compaction_references) with Ruby 3.2.0 on CI
+- bump duckdb to 0.6.1 on CI
+- add DuckDB::PreparedStatement#bind_hugeint_internal
+- fix gem install error on M1 MacOS
+- implement DuckDB.library_version
+- use duckdb_value_string instead of duckdb_value_varchar if duckdb_value_string is available.
+- bump Ruby to 3.2.0rc1
+- bump duckdb to 0.6.0
+
+## Breaking Change
+- drop duckdb <= 0.4.x. ruby-duckdb supports duckdb >= 0.5.0
+
 # 0.5.1.1
 - bug fix: reading the boolean column
 
 # 0.5.1
-- bump duckdb 0.5.1
+- bump duckdb to 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
+- bump duckdb to 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).
@@ -20,19 +34,19 @@
 - bind_varchar does not raised DuckDB::Error when the binding column is date or datetime.
 
 # 0.3.4.0
-- bump duckdb 0.3.4
+- bump duckdb to 0.3.4
 
 # 0.3.3.0
 - DuckDB::Column#type supports :decimal.
-- bump duckdb 0.3.3.
-- bump Ruby 2.6.10, 2.7.6, 3.0.4, 3.1.2.
+- bump duckdb to 0.3.3.
+- bump Ruby to 2.6.10, 2.7.6, 3.0.4, 3.1.2.
 
 # 0.3.2.0
 
 - bind_time, bind_timestamp, bind_date, bind_timeinterval to DuckDB::PreparedStatement
 - bump duckdb 0.3.2
-- bump Ruby 3.1.1, add Ruby mingw in CI.
-- bump Ruby 2.6.9, 2.7.5, 3.0.3 in CI.
+- bump Ruby to 3.1.1, add Ruby mingw in CI.
+- bump Ruby to 2.6.9, 2.7.5, 3.0.3 in CI.
 
 ## BREAKING CHANGE
 - drop duckdb <= 0.2.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    duckdb (0.5.1.1)
+    duckdb (0.6.1)
 
 GEM
   remote: https://rubygems.org/

data/ext/duckdb/duckdb.c

@@ -2,10 +2,24 @@
 
 VALUE mDuckDB;
 
+#ifdef HAVE_DUCKDB_H_GE_V060
+static VALUE duckdb_s_library_version(VALUE self);
+#endif
+
+#ifdef HAVE_DUCKDB_H_GE_V060
+static VALUE duckdb_s_library_version(VALUE self) {
+  return rb_str_new2(duckdb_library_version());
+}
+#endif
+
 void
 Init_duckdb_native(void) {
     mDuckDB = rb_define_module("DuckDB");
 
+#ifdef HAVE_DUCKDB_H_GE_V060
+    rb_define_singleton_method(mDuckDB, "library_version", duckdb_s_library_version, 0);
+#endif
+
     init_duckdb_error();
     init_duckdb_database();
     init_duckdb_connection();

data/ext/duckdb/extconf.rb

@@ -1,15 +1,34 @@
 require 'mkmf'
 
-dir_config('duckdb')
+def duckdb_library_available?(func)
+  header = find_header('duckdb.h') || find_header('duckdb.h', '/opt/homebrew/include')
+  library = have_func('duckdb', func) || find_library('duckdb', func, '/opt/homebrew/opt/duckdb/lib')
+  header && library
+end
+
+def check_duckdb_library(func, version)
+  return if duckdb_library_available?(func)
 
-raise 'duckdb library is not found. Install duckdb library file and header file.' unless have_library('duckdb')
+  msg = "duckdb >= #{version} is not found. Install duckdb >= #{version} library and header file."
+  puts ''
+  puts '*' * 80
+  puts msg
+  puts '*' * 80
+  puts ''
+  raise msg
+end
 
-raise 'duckdb >= 0.2.9 is required. Install duckdb >= 0.2.9' unless have_func('duckdb_value_is_null', 'duckdb.h')
+dir_config('duckdb')
+
+check_duckdb_library('duckdb_pending_prepared', '0.5.0')
 
 # check duckdb >= 0.3.3
 # ducdb >= 0.3.3 if duckdb_append_data_chunk() is defined.
 have_func('duckdb_append_data_chunk', 'duckdb.h')
 
+# check duckdb >= 0.6.0
+have_func('duckdb_value_string', 'duckdb.h')
+
 have_func('duckdb_free', 'duckdb.h')
 
 create_makefile('duckdb/duckdb_native')

data/ext/duckdb/prepared_statement.c

@@ -23,6 +23,7 @@ static VALUE duckdb_prepared_statement__bind_date(VALUE self, VALUE vidx, VALUE
 static VALUE duckdb_prepared_statement__bind_time(VALUE self, VALUE vidx, VALUE hour, VALUE min, VALUE sec, VALUE micros);
 static VALUE duckdb_prepared_statement__bind_timestamp(VALUE self, VALUE vidx, VALUE year, VALUE month, VALUE day, VALUE hour, VALUE min, VALUE sec, VALUE micros);
 static VALUE duckdb_prepared_statement__bind_interval(VALUE self, VALUE vidx, VALUE months, VALUE days, VALUE micros);
+static VALUE duckdb_prepared_statement__bind_hugeint(VALUE self, VALUE vidx, VALUE lower, VALUE upper);
 
 static const rb_data_type_t prepared_statement_data_type = {
     "DuckDB/PreparedStatement",
@@ -283,6 +284,22 @@ static VALUE duckdb_prepared_statement__bind_interval(VALUE self, VALUE vidx, VA
     return self;
 }
 
+static VALUE duckdb_prepared_statement__bind_hugeint(VALUE self, VALUE vidx, VALUE lower, VALUE upper) {
+    duckdb_hugeint hugeint;
+    rubyDuckDBPreparedStatement *ctx;
+    idx_t idx = check_index(vidx);
+
+    TypedData_Get_Struct(self, rubyDuckDBPreparedStatement, &prepared_statement_data_type, ctx);
+    hugeint.lower = NUM2ULL(lower);
+    hugeint.upper = NUM2LL(upper);
+
+    if (duckdb_bind_hugeint(ctx->prepared_statement, idx, hugeint) == DuckDBError) {
+        rb_raise(eDuckDBError, "fail to bind %llu parameter", (unsigned long long)idx);
+    }
+
+    return self;
+}
+
 void init_duckdb_prepared_statement(void) {
     cDuckDBPreparedStatement = rb_define_class_under(mDuckDB, "PreparedStatement", rb_cObject);
 
@@ -305,4 +322,5 @@ void init_duckdb_prepared_statement(void) {
     rb_define_private_method(cDuckDBPreparedStatement, "_bind_time", duckdb_prepared_statement__bind_time, 5);
     rb_define_private_method(cDuckDBPreparedStatement, "_bind_timestamp", duckdb_prepared_statement__bind_timestamp, 8);
     rb_define_private_method(cDuckDBPreparedStatement, "_bind_interval", duckdb_prepared_statement__bind_interval, 4);
+    rb_define_private_method(cDuckDBPreparedStatement, "_bind_hugeint", duckdb_prepared_statement__bind_hugeint, 3);
 }

data/ext/duckdb/result.c

@@ -271,14 +271,25 @@ static VALUE duckdb_result__to_double(VALUE oDuckDBResult, VALUE row_idx, VALUE
 
 static VALUE duckdb_result__to_string(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx) {
     rubyDuckDBResult *ctx;
+#ifdef HAVE_DUCKDB_H_GE_V060
+    duckdb_string p;
+#else
     char *p;
+#endif
     VALUE obj;
     TypedData_Get_Struct(oDuckDBResult, rubyDuckDBResult, &result_data_type, ctx);
 
+#ifdef HAVE_DUCKDB_H_GE_V060
+    p = duckdb_value_string(&(ctx->result), NUM2LL(col_idx), NUM2LL(row_idx));
+    if (p.data) {
+        obj = rb_utf8_str_new(p.data, p.size);
+        duckdb_free(p.data);
+#else
     p = duckdb_value_varchar(&(ctx->result), NUM2LL(col_idx), NUM2LL(row_idx));
     if (p) {
         obj = rb_utf8_str_new_cstr(p);
         duckdb_free(p);
+#endif
         return obj;
     }
     return Qnil;

data/ext/duckdb/ruby-duckdb.h

@@ -8,6 +8,10 @@
 #define HAVE_DUCKDB_H_GE_V033 1
 #endif
 
+#ifdef HAVE_DUCKDB_VALUE_STRING
+#define HAVE_DUCKDB_H_GE_V060 1
+#endif
+
 #include "./error.h"
 #include "./database.h"
 #include "./connection.h"

data/lib/duckdb/appender.rb

@@ -33,15 +33,8 @@ module DuckDB
     #     .end_row
     #
     def append_hugeint(value)
-      case value
-      when Integer
-        half = 1 << 64
-        upper = value / half
-        lower = value - upper * half
-        _append_hugeint(lower, upper)
-      else
-        raise(ArgumentError, "2nd argument `#{value}` must be Integer.")
-      end
+      lower, upper = integer_to_hugeint(value)
+      _append_hugeint(lower, upper)
     end
 
     #

data/lib/duckdb/converter.rb

@@ -1,7 +1,20 @@
 module DuckDB
   module Converter
+    HALF_HUGEINT = 1 << 64
+
     private
 
+    def integer_to_hugeint(value)
+      case value
+      when Integer
+        upper = value / HALF_HUGEINT
+        lower = value - upper * HALF_HUGEINT
+        [lower, upper]
+      else
+        raise(ArgumentError, "2nd argument `#{value}` must be Integer.")
+      end
+    end
+
     def iso8601_interval_to_hash(value)
       digit = ''
       time = false

data/lib/duckdb/prepared_statement.rb

@@ -15,10 +15,21 @@ module DuckDB
   class PreparedStatement
     include DuckDB::Converter
 
-    RANGE_INT16 = -32768..32767
-    RANGE_INT32 = -2147483648..2147483647
-    RANGE_INT64 = -9223372036854775808..9223372036854775807
+    RANGE_INT16 = -32_768..32_767
+    RANGE_INT32 = -2_147_483_648..2_147_483_647
+    RANGE_INT64 = -9_223_372_036_854_775_808..9_223_372_036_854_775_807
 
+    # binds i-th parameter with SQL prepared statement.
+    # The first argument is index of parameter.
+    # The index of first parameter is 1 not 0.
+    # The second argument value is to expected Integer value.
+    # This method uses bind_varchar internally.
+    #   require 'duckdb'
+    #   db = DuckDB::Database.open('duckdb_database')
+    #   con = db.connect
+    #   sql ='SELECT name FROM users WHERE bigint_col = ?'
+    #   stmt = PreparedStatement.new(con, sql)
+    #   stmt.bind_hugeint(1, 1_234_567_890_123_456_789_012_345)
     def bind_hugeint(i, value)
       case value
       when Integer
@@ -28,6 +39,22 @@ module DuckDB
       end
     end
 
+    # binds i-th parameter with SQL prepared statement.
+    # The first argument is index of parameter.
+    # The index of first parameter is 1 not 0.
+    # The second argument value must be Integer value.
+    # This method uses duckdb_bind_hugeint internally.
+    #   require 'duckdb'
+    #   db = DuckDB::Database.open('duckdb_database')
+    #   con = db.connect
+    #   sql ='SELECT name FROM users WHERE bigint_col = ?'
+    #   stmt = PreparedStatement.new(con, sql)
+    #   stmt.bind_hugeint_internal(1, 1_234_567_890_123_456_789_012_345)
+    def bind_hugeint_internal(index, value)
+      lower, upper = integer_to_hugeint(value)
+      _bind_hugeint(index, lower, upper)
+    end
+
     # binds i-th parameter with SQL prepared statement.
     # The first argument is index of parameter.
     # The index of first parameter is 1 not 0.

data/lib/duckdb/version.rb

@@ -1,5 +1,5 @@
 module DuckDB
   # The version string of ruby-duckdb.
   # Currently, ruby-duckdb is NOT semantic versioning.
-  VERSION = '0.5.1.1'.freeze
+  VERSION = '0.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 0.5.1.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Masaki Suketa
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-13 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,7 +129,7 @@ metadata:
   homepage_uri: https://github.com/suketa/ruby-duckdb
   source_code_uri: https://github.com/suketa/ruby-duckdb
   changelog_uri: https://github.com/suketa/ruby-duckdb/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -144,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
-signing_key:
+rubygems_version: 3.4.1
+signing_key: 
 specification_version: 4
 summary: This module is Ruby binding for DuckDB database engine.
 test_files: []