duckdb 1.1.0.1 → 1.1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 874174344b2be8ad2eba6fa1e89d2c96827a7e53e0982bacaa7a804b1ee8cf0b
-  data.tar.gz: 9d57293bc3dc59cc10ad7a23ae8e0b8ed4944524c83ecd3e5e9503c6f460d73f
+  metadata.gz: 7b6ad88562489a943d5ed0a4fcf56c4f84c9c3aa1a9f28d6d1fc6431c3fcea0b
+  data.tar.gz: ac3047cf0098642db942d3547d1e8069fdb53ac0c8eb7f757a0f15c31465b895
 SHA512:
-  metadata.gz: b8739a162ec00fb0bb98e13d4f9adecb8f3230e2b4fa81067a128ce4f9db4456b76fe825652ba09b46a5c05fb1f7637a762f369f28f9d7d9423649f7e646b7f0
-  data.tar.gz: 3b564b2aa68cbfcc5eec96d9cc4dd038749d172b28b2329ba20af14610bc1db34a270d3034688dfdf852b26edd0a711d803886e3d731619848d5cd5e6ca331be
+  metadata.gz: 5614558f8685681f3369dfb4d8e36ead416b7ba1e4b0de48ff5edcc375a99c43bc1c3d996eca1f083d2df0352ced146f1e6d23bff99fa193035c9f996674e63d
+  data.tar.gz: 2ace009816b0dfee961d8db1b0864e512239186ebf7b8b0ffe20a360e0a247a68afd11c4b97993e350f7b2a7f8eb29d4b4b3fcb367b31c575a6163d1d9d333c6

data/.github/workflows/test_on_macos.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: ['3.1.6', '3.2.5', '3.3.5', '3.4.0-preview1', 'head']
-        duckdb: ['1.1.0', '1.0.0', '0.10.3']
+        ruby: ['3.1.6', '3.2.5', '3.3.5', '3.4.0-preview2', 'head']
+        duckdb: ['1.1.2', '1.1.1', '1.0.0']
 
     steps:
     - uses: actions/checkout@v4
@@ -51,12 +51,12 @@ jobs:
       run: |
         bundle install --jobs 4 --retry 3
 
-    # - name: Build test with DUCKDB_API_NO_DEPRECATED and Ruby ${{ matrix.ruby }}
-    #   env:
-    #     DUCKDB_VERSION: ${{ matrix.duckdb }}
-    #   run: |
-    #     env DUCKDB_API_NO_DEPRECATED=1 bundle exec rake build -- --with-duckdb-include=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/src/include --with-duckdb-lib=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/build/release/src/
-    #     bundle exec rake clean
+    - name: Build test with DUCKDB_API_NO_DEPRECATED and Ruby ${{ matrix.ruby }}
+      env:
+        DUCKDB_VERSION: ${{ matrix.duckdb }}
+      run: |
+        env DUCKDB_API_NO_DEPRECATED=1 bundle exec rake build -- --with-duckdb-include=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/src/include --with-duckdb-lib=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/build/release/src/
+        bundle exec rake clean
 
     - name: Build with Ruby ${{ matrix.ruby }}
       env:

data/.github/workflows/test_on_ubuntu.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['3.1.6', '3.2.5', '3.3.5', '3.4.0-preview1', 'head']
-        duckdb: ['1.1.0', '1.0.0', '0.10.3']
+        ruby: ['3.1.6', '3.2.5', '3.3.5', '3.4.0-preview2', 'head']
+        duckdb: ['1.1.2', '1.1.1', '1.0.0']
 
     steps:
     - uses: actions/checkout@v4

data/.github/workflows/test_on_windows.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['3.1.6', '3.2.5', '3.3.5', 'ucrt', 'mingw', 'mswin', 'head']
-        duckdb: ['1.1.0', '1.0.0', '0.10.3']
+        duckdb: ['1.1.2', '1.1.1', '1.0.0']
 
     steps:
     - uses: actions/checkout@v4

data/.gitignore

@@ -15,3 +15,4 @@
 *.obj
 *.so
 Makefile
+ng_test

data/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 # Unreleased
 
+# 1.1.2.0 - 2024-10-20
+- bump duckdb to 1.1.2.
+- add `DuckDB::PreparedStatement#destroy`.
+- `DuckDB::Connection#query`, `DuckDB::Connection#async_query`, `DuckDB::Connection#async_query_stream` call
+  `DuckDB::PreparedStatement#destroy` to free the prepared statement immediately (#775, #781).
+
+# 1.1.1.0 - 2024-10-06
+- bump duckdb to 1.1.1.
+## Breaking changes
+- drop duckdb v0.10.x.
+
 # 1.1.0.1 - 2024-09-21
 - add `DuckDB::Connection#prepare`. `DuckDB::Connection#prepare` is an alias of `DuckDB::Connection#prepared_statement`.
 

data/CONTRIBUTION.md

@@ -14,7 +14,7 @@ docker compose run --rm ubuntu bash
 
 In case you want custom ruby or duckdb versions, use `--build-arg` options
 ```
-docker-compose build ubuntu --build-arg RUBY_VERSION=3.1.3 --build-arg DUCKDB_VERSION=0.6.0
+docker compose build ubuntu --build-arg RUBY_VERSION=3.1.3 --build-arg DUCKDB_VERSION=1.0.0
 ```
 
 ### Without docker

data/Dockerfile

@@ -1,7 +1,7 @@
 ARG RUBY_VERSION=3.3.5
 FROM ruby:${RUBY_VERSION}
 
-ARG DUCKDB_VERSION=1.1.0
+ARG DUCKDB_VERSION=1.1.2
 
 RUN apt update -qq && \
     apt install -y build-essential curl git wget

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in duckdb.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    duckdb (1.1.0.1)
+    duckdb (1.1.2.0)
       bigdecimal (>= 3.1.4)
 
 GEM
@@ -18,7 +18,7 @@ GEM
       racc (~> 1.4)
     racc (1.8.1)
     rake (13.2.1)
-    rake-compiler (1.2.7)
+    rake-compiler (1.2.8)
       rake
     ruby_memcheck (3.0.0)
       nokogiri

data/ext/duckdb/connection.c

@@ -106,20 +106,12 @@ static VALUE duckdb_connection_interrupt(VALUE self) {
  */
 static VALUE duckdb_connection_query_progress(VALUE self) {
     rubyDuckDBConnection *ctx;
-#ifdef HAVE_DUCKDB_H_GE_V0_10_0
     duckdb_query_progress_type progress;
-#else
-    double progress;
-#endif
 
     TypedData_Get_Struct(self, rubyDuckDBConnection, &connection_data_type, ctx);
     progress = duckdb_query_progress(ctx->con);
 
-#ifdef HAVE_DUCKDB_H_GE_V0_10_0
     return rb_funcall(mDuckDBConverter, rb_intern("_to_query_progress"), 3, DBL2NUM(progress.percentage), ULL2NUM(progress.rows_processed), ULL2NUM(progress.total_rows_to_process));
-#else
-    return DBL2NUM(progress);
-#endif
 }
 
 static VALUE duckdb_connection_connect(VALUE self, VALUE oDuckDBDatabase) {

data/ext/duckdb/extconf.rb

@@ -2,7 +2,7 @@
 
 require 'mkmf'
 
-DUCKDB_REQUIRED_VERSION = '0.10.0'
+DUCKDB_REQUIRED_VERSION = '1.0.0'
 
 def check_duckdb_header(header, version)
   found = find_header(
@@ -58,8 +58,8 @@ dir_config('duckdb')
 check_duckdb_header('duckdb.h', DUCKDB_REQUIRED_VERSION)
 check_duckdb_library('duckdb', 'duckdb_appender_column_count', DUCKDB_REQUIRED_VERSION)
 
-# check duckdb >= 0.10.0
-have_func('duckdb_appender_column_count', 'duckdb.h')
+# check duckdb >= 1.0.0
+have_func('duckdb_fetch_chunk', 'duckdb.h')
 
 # check duckdb >= 1.0.0
 have_func('duckdb_fetch_chunk', 'duckdb.h')
@@ -67,6 +67,10 @@ have_func('duckdb_fetch_chunk', 'duckdb.h')
 # check duckdb >= 1.1.0
 have_func('duckdb_result_error_type', 'duckdb.h')
 
+# Building with enabled DUCKDB_API_NO_DEPRECATED is failed with DuckDB v1.1.0 only.
+# DuckDB v1.1.1 is fixed this issue https://github.com/duckdb/duckdb/issues/13872.
+have_const('DUCKDB_TYPE_SQLNULL', 'duckdb.h')
+
 $CFLAGS << ' -DDUCKDB_API_NO_DEPRECATED' if ENV['DUCKDB_API_NO_DEPRECATED']
 
 create_makefile('duckdb/duckdb_native')

data/ext/duckdb/prepared_statement.c

@@ -2,12 +2,14 @@
 
 VALUE cDuckDBPreparedStatement;
 
+static void destroy_prepared_statement(rubyDuckDBPreparedStatement *p);
 static void deallocate(void *ctx);
 static VALUE allocate(VALUE klass);
 static size_t memsize(const void *p);
 static VALUE duckdb_prepared_statement_initialize(VALUE self, VALUE con, VALUE query);
 static VALUE duckdb_prepared_statement_nparams(VALUE self);
 static VALUE duckdb_prepared_statement_execute(VALUE self);
+static VALUE duckdb_prepared_statement_destroy(VALUE self);
 static idx_t check_index(VALUE vidx);
 
 static VALUE duckdb_prepared_statement_bind_parameter_index(VALUE self, VALUE name);
@@ -37,10 +39,17 @@ static const rb_data_type_t prepared_statement_data_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
+static void destroy_prepared_statement(rubyDuckDBPreparedStatement *p) {
+    if (p->prepared_statement) {
+        duckdb_destroy_prepare(&(p->prepared_statement));
+    }
+}
+
 static void deallocate(void *ctx) {
     rubyDuckDBPreparedStatement *p = (rubyDuckDBPreparedStatement *)ctx;
 
-    duckdb_destroy_prepare(&(p->prepared_statement));
+    destroy_prepared_statement(p);
+    // duckdb_destroy_prepare(&(p->prepared_statement));
     xfree(p);
 }
 
@@ -91,7 +100,6 @@ static VALUE duckdb_prepared_statement_nparams(VALUE self) {
     return ULL2NUM(duckdb_nparams(ctx->prepared_statement));
 }
 
-
 static VALUE duckdb_prepared_statement_execute(VALUE self) {
     rubyDuckDBPreparedStatement *ctx;
     rubyDuckDBResult *ctxr;
@@ -105,6 +113,19 @@ static VALUE duckdb_prepared_statement_execute(VALUE self) {
     return result;
 }
 
+/*
+ * :nodoc:
+ */
+static VALUE duckdb_prepared_statement_destroy(VALUE self) {
+    rubyDuckDBPreparedStatement *ctx;
+    TypedData_Get_Struct(self, rubyDuckDBPreparedStatement, &prepared_statement_data_type, ctx);
+    destroy_prepared_statement(ctx);
+    /*
+    ctx->prepared_statement = NULL;
+    */
+    return Qnil;
+}
+
 static idx_t check_index(VALUE vidx) {
     idx_t idx = NUM2ULL(vidx);
     if (idx <= 0) {
@@ -391,6 +412,7 @@ void rbduckdb_init_duckdb_prepared_statement(void) {
 
     rb_define_method(cDuckDBPreparedStatement, "initialize", duckdb_prepared_statement_initialize, 2);
     rb_define_method(cDuckDBPreparedStatement, "execute", duckdb_prepared_statement_execute, 0);
+    rb_define_method(cDuckDBPreparedStatement, "destroy", duckdb_prepared_statement_destroy, 0);
     rb_define_method(cDuckDBPreparedStatement, "nparams", duckdb_prepared_statement_nparams, 0);
     rb_define_method(cDuckDBPreparedStatement, "bind_parameter_index", duckdb_prepared_statement_bind_parameter_index, 1);
     rb_define_method(cDuckDBPreparedStatement, "parameter_name", duckdb_prepared_statement_parameter_name, 1);

data/ext/duckdb/result.c

@@ -310,7 +310,14 @@ static VALUE duckdb_result__column_type(VALUE oDuckDBResult, VALUE col_idx) {
 static VALUE duckdb_result__return_type(VALUE oDuckDBResult) {
     rubyDuckDBResult *ctx;
     TypedData_Get_Struct(oDuckDBResult, rubyDuckDBResult, &result_data_type, ctx);
+/*
+ * remove this #if ... #else statement when dropping duckdb 1.1.0.
+ */
+#if !defined(HAVE_DUCKDB_H_GE_V1_1_1) && defined(HAVE_DUCKDB_H_GE_V1_1_0) && defined(DUCKDB_API_NO_DEPRECATED)
+    rb_raise(eDuckDBError, "duckdb_result_return_type C-API is not available with duckdb v1.1.0 with enabled DUCKDB_API_NO_DEPRECATED.");
+#else
     return INT2FIX(duckdb_result_return_type(ctx->result));
+#endif
 }
 
 static VALUE duckdb_result__statement_type(VALUE oDuckDBResult) {

data/ext/duckdb/ruby-duckdb.h

@@ -7,10 +7,6 @@
 #include "ruby.h"
 #include <duckdb.h>
 
-#ifdef HAVE_DUCKDB_APPENDER_COLUMN_COUNT
-#define HAVE_DUCKDB_H_GE_V0_10_0 1
-#endif
-
 #ifdef HAVE_DUCKDB_FETCH_CHUNK
 #define HAVE_DUCKDB_H_GE_V1_0_0 1
 #endif
@@ -19,6 +15,10 @@
 #define HAVE_DUCKDB_H_GE_V1_1_0 1
 #endif
 
+#ifdef HAVE_CONST_DUCKDB_TYPE_SQLNULL
+#define HAVE_DUCKDB_H_GE_V1_1_1 1
+#endif
+
 #include "./error.h"
 #include "./database.h"
 #include "./connection.h"

data/lib/duckdb/connection.rb

@@ -31,6 +31,8 @@ module DuckDB
       stmt = PreparedStatement.new(self, sql)
       stmt.bind_args(*args, **kwargs)
       stmt.execute
+    ensure
+      stmt&.destroy
     end
 
     #
@@ -53,6 +55,8 @@ module DuckDB
       stmt = PreparedStatement.new(self, sql)
       stmt.bind_args(*args, **kwargs)
       stmt.pending_prepared
+    ensure
+      stmt&.destroy
     end
 
     #
@@ -76,6 +80,8 @@ module DuckDB
       stmt = PreparedStatement.new(self, sql)
       stmt.bind_args(*args, **kwargs)
       stmt.pending_prepared_stream
+    ensure
+      stmt&.destroy
     end
 
     #

data/lib/duckdb/converter/int_to_sym.rb

@@ -2,7 +2,7 @@
 
 module DuckDB
   module Converter
-    module IntToSym
+    module IntToSym # :nodoc: all
       STATEMENT_TYPES = %i[
         invalid
         select
@@ -34,90 +34,52 @@ module DuckDB
         multi
       ].freeze
 
-      HASH_TYPES = if Gem::Version.new(DuckDB::LIBRARY_VERSION) == Gem::Version.new('0.10.0')
-                     {
-                       0 => :invalid,
-                       1 => :boolean,
-                       2 => :tinyint,
-                       3 => :smallint,
-                       4 => :integer,
-                       5 => :bigint,
-                       6 => :utinyint,
-                       7 => :usmallint,
-                       8 => :uinteger,
-                       9 => :ubigint,
-                       10 => :float,
-                       11 => :double,
-                       12 => :timestamp,
-                       13 => :date,
-                       14 => :time,
-                       15 => :interval,
-                       16 => :hugeint,
-                       17 => :uhugeint,
-                       18 => :varchar,
-                       19 => :blob,
-                       20 => :decimal,
-                       21 => :timestamp_s,
-                       22 => :timestamp_ms,
-                       23 => :timestamp_ns,
-                       24 => :enum,
-                       25 => :list,
-                       26 => :struct,
-                       27 => :map,
-                       28 => :uuid,
-                       29 => :union,
-                       30 => :bit,
-                       31 => :time_tz,
-                       32 => :timestamp_tz
-                     }.freeze
-                   else
-                     {
-                       0 => :invalid,
-                       1 => :boolean,
-                       2 => :tinyint,
-                       3 => :smallint,
-                       4 => :integer,
-                       5 => :bigint,
-                       6 => :utinyint,
-                       7 => :usmallint,
-                       8 => :uinteger,
-                       9 => :ubigint,
-                       10 => :float,
-                       11 => :double,
-                       12 => :timestamp,
-                       13 => :date,
-                       14 => :time,
-                       15 => :interval,
-                       16 => :hugeint,
-                       32 => :uhugeint,
-                       17 => :varchar,
-                       18 => :blob,
-                       19 => :decimal,
-                       20 => :timestamp_s,
-                       21 => :timestamp_ms,
-                       22 => :timestamp_ns,
-                       23 => :enum,
-                       24 => :list,
-                       25 => :struct,
-                       26 => :map,
-                       33 => :array,
-                       27 => :uuid,
-                       28 => :union,
-                       29 => :bit,
-                       30 => :time_tz,
-                       31 => :timestamp_tz
-                     }.freeze
-                   end
+      HASH_TYPES = {
+        0 => :invalid,
+        1 => :boolean,
+        2 => :tinyint,
+        3 => :smallint,
+        4 => :integer,
+        5 => :bigint,
+        6 => :utinyint,
+        7 => :usmallint,
+        8 => :uinteger,
+        9 => :ubigint,
+        10 => :float,
+        11 => :double,
+        12 => :timestamp,
+        13 => :date,
+        14 => :time,
+        15 => :interval,
+        16 => :hugeint,
+        32 => :uhugeint,
+        17 => :varchar,
+        18 => :blob,
+        19 => :decimal,
+        20 => :timestamp_s,
+        21 => :timestamp_ms,
+        22 => :timestamp_ns,
+        23 => :enum,
+        24 => :list,
+        25 => :struct,
+        26 => :map,
+        33 => :array,
+        27 => :uuid,
+        28 => :union,
+        29 => :bit,
+        30 => :time_tz,
+        31 => :timestamp_tz
+      }.freeze
 
       module_function
 
-      def statement_type_to_sym(val)
+      def statement_type_to_sym(val) # :nodoc:
         raise DuckDB::Error, "Unknown statement type: #{val}" if val >= STATEMENT_TYPES.size
 
         STATEMENT_TYPES[val]
       end
 
-      def type_to_sym(val)
+      def type_to_sym(val) # :nodoc:
         raise DuckDB::Error, "Unknown type: #{val}" unless HASH_TYPES.key?(val)
 
         HASH_TYPES[val]

data/lib/duckdb/converter.rb

@@ -7,7 +7,7 @@ require_relative 'converter/int_to_sym'
 module DuckDB
   QueryProgress = Struct.new(:percentage, :rows_processed, :total_rows_to_process)
 
-  module Converter
+  module Converter # :nodoc: all
     HALF_HUGEINT_BIT = 64
     HALF_HUGEINT = 1 << HALF_HUGEINT_BIT
     FLIP_HUGEINT = 1 << 63
@@ -122,7 +122,7 @@ module DuckDB
     end
 
     def _to_uuid_from_vector(lower, upper)
-      upper = upper ^ FLIP_HUGEINT
+      upper ^= FLIP_HUGEINT
       upper += HALF_HUGEINT if upper.negative?
 
       str = _to_hugeint_from_vector(lower, upper).to_s(16).rjust(32, '0')

data/lib/duckdb/result.rb

@@ -34,7 +34,7 @@ module DuckDB
         raise DuckDB::Error, 'DuckDB::Result cannot be instantiated directly.'
       end
 
-      def use_chunk_each=(value)
+      def use_chunk_each=(value) # :nodoc:
         raise('`changing DuckDB::Result.use_chunk_each to false` was deprecated.') unless value
 
         warn('`DuckDB::Result.use_chunk_each=` will be deprecated.')
@@ -42,21 +42,21 @@ module DuckDB
         true
       end
 
-      def use_chunk_each?
+      def use_chunk_each? # :nodoc:
         warn('`DuckDB::Result.use_chunk_each?` will be deprecated.')
         true
       end
     end
 
-    def each
+    def each(&)
       if streaming?
         return _chunk_stream unless block_given?
 
-        _chunk_stream { |row| yield row }
+        _chunk_stream(&)
       else
         return chunk_each unless block_given?
 
-        chunk_each { |row| yield row }
+        chunk_each(&)
       end
     end
 
@@ -91,6 +91,14 @@ module DuckDB
       Converter::IntToSym.statement_type_to_sym(i)
     end
 
+    # returns all available ENUM type values of the specified column index.
+    #   require 'duckdb'
+    #   db = DuckDB::Database.open('duckdb_database')
+    #   con = db.connect
+    #   con.execute("CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy', '𝘾𝝾օɭ 😎')")
+    #   con.execute("CREATE TABLE enums (id INTEGER, mood mood)")
+    #   result = con.query('SELECT * FROM enums')
+    #   result.enum_dictionary_values(1) # => ['sad', 'ok', 'happy', '𝘾𝝾օɭ 😎']
     def enum_dictionary_values(col_index)
       values = []
       _enum_dictionary_size(col_index).times do |i|

data/lib/duckdb/version.rb

@@ -3,5 +3,5 @@
 module DuckDB
   # The version string of ruby-duckdb.
   # Currently, ruby-duckdb is NOT semantic versioning.
-  VERSION = '1.1.0.1'
+  VERSION = '1.1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 1.1.0.1
+  version: 1.1.2.0
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-20 00:00:00.000000000 Z
+date: 2024-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal