duckdb 1.2.2.0 → 1.3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dc90028f52da778feed9afafb7e1bddfa8128120dea8c798fec4c21317cc8e1
-  data.tar.gz: 5cb1ae0ae04c712c0edcd5dc61ac7a05c12e6ee59c7c72a113f8ea3a8012aa2e
+  metadata.gz: 979c1ffbe5e1137870bd777377ef16cb7ddde8499d5d9fd14fcd6a5fe401ffda
+  data.tar.gz: 72d970b664aed935c451a95e48818584cf0ecd029ade167bef88235eed62fc6c
 SHA512:
-  metadata.gz: 3dce5d6c09d593ae95e59aed616ce83d1849136bcbfe7b1f668e8e515a1c8941cf18bd62593bfaec7a4f587731e2cad841d03d0d743da49c3c18ae7f346e3528
-  data.tar.gz: 5852c870293bd442e2afcf8c624fe21c1695803f4102a065b142d6c64b8639dc793af30852717742571d6d49d89d4753b4df805173a36f895fbc6bbaaa446c8b
+  metadata.gz: cfb967f5ce29966491958e8e0c724716eacb7d36e0692a522b01ebca148e26ae5306cbc9306d64299fec16e79f96967863dad73cdc2c0d77bf4382bacfd25a00
+  data.tar.gz: 9a1edecd631f9b7e891b49afd71eea1baebdf1defc6488222469b6e435ce39510ecfaadcb3329d387500bbf49d87ac3344ac11ffb17ffb257836c6c6007b5811

data/.github/workflows/test_on_macos.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: ['3.2.7', '3.3.8', '3.4.2', 'head']
-        duckdb: ['1.2.2', '1.1.3', '1.1.1']
+        ruby: ['3.2.7', '3.3.8', '3.4.2', 'head', '3.5.0-preview1']
+        duckdb: ['1.2.2', '1.3.1']
 
     steps:
     - uses: actions/checkout@v4

data/.github/workflows/test_on_ubuntu.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['3.2.7', '3.3.8', '3.4.2', 'head']
-        duckdb: ['1.2.2', '1.1.3', '1.1.1']
+        ruby: ['3.2.7', '3.3.8', '3.4.2', 'head', '3.5.0-preview1']
+        duckdb: ['1.2.2', '1.3.1']
 
     steps:
     - uses: actions/checkout@v4

data/.github/workflows/test_on_windows.yml

@@ -15,9 +15,8 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        # ruby: ['3.2.6', '3.3.6', '3.4.1', 'ucrt', 'mingw', 'mswin', 'head']
-        ruby: ['3.2.6', '3.3.6', '3.4.1', 'ucrt', 'mingw', 'mswin']
-        duckdb: ['1.2.2', '1.1.3', '1.1.1']
+        ruby: ['3.2.6', '3.3.8', '3.4.1', 'ucrt', 'mingw', 'mswin', 'head']
+        duckdb: ['1.2.2', '1.3.1']
 
     steps:
     - uses: actions/checkout@v4

data/CHANGELOG.md

@@ -1,7 +1,23 @@
 # Changelog
 
 All notable changes to this project will be documented in this file.
-# Unreleased
+
+# 1.3.1.0 - 2025-06-28
+- Support TIMESTAMP_S, TIMESTAMP_MS infinity, -infinity value.
+- bump duckdb to 1.3.1 on CI.
+- drop dcukdb v1.1.x.
+
+# 1.3.0.0 - 2025-05-31
+- bump duckdb to 1.3.0 on CI.
+
+## Breaking changes
+- `DuckDB::Result#streaming?` is deprecated.
+- The second argument of `DuckDB::PendingResult.new` is now meaningless. The result is the same when it is set to true.
+- `DuckDB::PreparedStatement#pending_prepared` behaves the same as `DuckDB::PreparedStatement#pending_prepared_stream`.
+  - `DuckDB::PreparedStatement#pending_prepared_stream` will be depreacted. Use `pending_prepared` instead.
+- `DuckDB::Connection#async_query` behaves the same as `DuckDB::Connection#async_query_stream`.
+  - `DuckDB::Connection#async_query_stream` will be deprecated. Use `async_query` instead.
+- `DuckDB::Result#chunk_each`, `DuckDB::Result.use_chunk_each`, `DuckDB::Result.use_chunk_each?` are deprecated.
 
 # 1.2.2.0 - 2025-05-11
 - drop Ruby 3.1.

data/Dockerfile

@@ -1,11 +1,12 @@
-ARG RUBY_VERSION=3.4.2
+ARG RUBY_VERSION=3.4.4
 FROM ruby:${RUBY_VERSION}
 
-ARG DUCKDB_VERSION=1.2.2
+ARG DUCKDB_VERSION=1.3.1
 ARG VALGRIND_VERSION=3.21.0
 
-RUN apt update -qq && \
-    apt install -y build-essential curl git wget libc6-dbg
+RUN apt-get update -qq && \
+    apt-get install -y --no-install-recommends build-essential curl git wget libc6-dbg && \
+    apt-get clean
 
 COPY getduckdb.sh .
 RUN ./getduckdb.sh

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    duckdb (1.2.2.0)
+    duckdb (1.3.1.0)
       bigdecimal (>= 3.1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     benchmark-ips (2.14.0)
-    bigdecimal (3.1.9)
-    mini_portile2 (2.8.8)
+    bigdecimal (3.2.2)
+    mini_portile2 (2.8.9)
     minitest (5.25.5)
     nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
@@ -25,7 +25,7 @@ GEM
     nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
     racc (1.8.1)
-    rake (13.2.1)
+    rake (13.3.0)
     rake-compiler (1.3.0)
       rake
     ruby_memcheck (3.0.1)

data/README.md

@@ -146,7 +146,7 @@ result = con.prepare('SELECT * FROM users WHERE name = $name AND email = $email'
 You can use async query.
 
 ```ruby
-pending_result = con.async_query_stream('SLOW QUERY')
+pending_result = con.async_query('SLOW QUERY')
 pending_result.execute_task while pending_result.state == :not_ready
 
 result = pending_result.execute_pending

data/ext/duckdb/duckdb.c

@@ -39,7 +39,5 @@ Init_duckdb_native(void) {
     rbduckdb_init_duckdb_config();
     rbduckdb_init_duckdb_converter();
     rbduckdb_init_duckdb_extracted_statements();
-#ifdef HAVE_DUCKDB_H_GE_V1_2_0
     rbduckdb_init_duckdb_instance_cache();
-#endif
 }

data/ext/duckdb/extconf.rb

@@ -2,7 +2,7 @@
 
 require 'mkmf'
 
-DUCKDB_REQUIRED_VERSION = '1.1.0'
+DUCKDB_REQUIRED_VERSION = '1.2.0'
 
 def check_duckdb_header(header, version)
   found = find_header(
@@ -56,17 +56,13 @@ end
 dir_config('duckdb')
 
 check_duckdb_header('duckdb.h', DUCKDB_REQUIRED_VERSION)
-check_duckdb_library('duckdb', 'duckdb_result_error_type', DUCKDB_REQUIRED_VERSION)
-
-# check duckdb >= 1.1.0
-have_func('duckdb_result_error_type', 'duckdb.h')
+check_duckdb_library('duckdb', 'duckdb_create_instance_cache', DUCKDB_REQUIRED_VERSION)
 
 # check duckdb >= 1.2.0
 have_func('duckdb_create_instance_cache', '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')
+# check duckdb >= 1.3.0
+have_func('duckdb_get_table_names', 'duckdb.h')
 
 $CFLAGS << ' -DDUCKDB_API_NO_DEPRECATED' if ENV['DUCKDB_API_NO_DEPRECATED']
 

data/ext/duckdb/instance_cache.c

@@ -1,6 +1,5 @@
 #include "ruby-duckdb.h"
 
-#ifdef HAVE_DUCKDB_H_GE_V1_2_0
 VALUE cDuckDBInstanceCache;
 
 static void deallocate(void * ctx);
@@ -105,4 +104,3 @@ void rbduckdb_init_duckdb_instance_cache(void) {
     rb_define_method(cDuckDBInstanceCache, "destroy", duckdb_instance_cache_destroy, 0);
     rb_define_alloc_func(cDuckDBInstanceCache, allocate);
 }
-#endif

data/ext/duckdb/instance_cache.h

@@ -1,8 +1,6 @@
 #ifndef RUBY_DUCKDB_INSTANCE_CACHE_H
 #define RUBY_DUCKDB_INSTANCE_CACHE_H
 
-#ifdef HAVE_DUCKDB_H_GE_V1_2_0
-
 struct _rubyDuckDBInstanceCache {
     duckdb_instance_cache instance_cache;
 };
@@ -12,6 +10,3 @@ typedef struct _rubyDuckDBInstanceCache rubyDuckDBInstanceCache;
 void rbduckdb_init_duckdb_instance_cache(void);
 
 #endif
-
-#endif
-

data/ext/duckdb/pending_result.c

@@ -40,13 +40,9 @@ static VALUE duckdb_pending_result_initialize(int argc, VALUE *argv, VALUE self)
     VALUE streaming_p = Qfalse;
     duckdb_state state;
 
-    /*
-     * FIXME: The 2nd argument is deprecated and will be removed in the future.
-     * The behavior will be same as streaming.
     if (argc == 2) {
-        rb_warn("The 2nd argument is deprecated and will be removed in the future.");
+        rb_warn("The second argument of `DuckDB::PendingResult#new` is now meaningless. The result is the same when it is set to true.");
     }
-    */
     rb_scan_args(argc, argv, "11", &oDuckDBPreparedStatement, &streaming_p);
 
     if (rb_obj_is_kind_of(oDuckDBPreparedStatement, cDuckDBPreparedStatement) != Qtrue) {
@@ -56,20 +52,7 @@ static VALUE duckdb_pending_result_initialize(int argc, VALUE *argv, VALUE self)
     rubyDuckDBPendingResult *ctx = get_struct_pending_result(self);
     rubyDuckDBPreparedStatement *stmt = get_struct_prepared_statement(oDuckDBPreparedStatement);
 
-#ifdef DUCKDB_API_NO_DEPRECATED
     state = duckdb_pending_prepared(stmt->prepared_statement, &(ctx->pending_result));
-#else
-    /*
-     * FIXME: streaming_p check will be removed in the future.
-     *
-     * state = duckdb_pending_prepared(stmt->prepared_statement, &(ctx->pending_result));
-     */
-    if (!NIL_P(streaming_p) && streaming_p == Qtrue) {
-        state = duckdb_pending_prepared_streaming(stmt->prepared_statement, &(ctx->pending_result));
-    } else {
-        state = duckdb_pending_prepared(stmt->prepared_statement, &(ctx->pending_result));
-    }
-#endif
 
     if (state == DuckDBError) {
         rb_raise(eDuckDBError, "%s", duckdb_pending_error(ctx->pending_result));

data/ext/duckdb/result.c

@@ -26,9 +26,7 @@ static size_t memsize(const void *p);
 static VALUE duckdb_result_column_count(VALUE oDuckDBResult);
 static VALUE duckdb_result_rows_changed(VALUE oDuckDBResult);
 static VALUE duckdb_result_columns(VALUE oDuckDBResult);
-static VALUE duckdb_result_streaming_p(VALUE oDuckDBResult);
 static VALUE destroy_data_chunk(VALUE arg);
-static VALUE duckdb_result__chunk_each(VALUE oDuckDBResult);
 
 static VALUE duckdb_result__chunk_stream(VALUE oDuckDBResult);
 static VALUE yield_rows(VALUE arg);
@@ -50,6 +48,9 @@ static VALUE vector_hugeint(void* vector_data, idx_t row_idx);
 static VALUE vector_uhugeint(void* vector_data, idx_t row_idx);
 static VALUE vector_decimal(duckdb_logical_type ty, void* vector_data, idx_t row_idx);
 static VALUE infinite_timestamp_value(duckdb_timestamp timestamp);
+static VALUE infinite_timestamp_s_value(duckdb_timestamp_s timestamp_s);
+static VALUE infinite_timestamp_ms_value(duckdb_timestamp_ms timestamp_ms);
+
 static VALUE vector_timestamp_s(void* vector_data, idx_t row_idx);
 static VALUE vector_timestamp_ms(void* vector_data, idx_t row_idx);
 static VALUE vector_timestamp_ns(void* vector_data, idx_t row_idx);
@@ -168,63 +169,12 @@ static VALUE duckdb_result_columns(VALUE oDuckDBResult) {
     return ary;
 }
 
-/*
- * :nodoc:
- */
-static VALUE duckdb_result_streaming_p(VALUE oDuckDBResult) {
-    rubyDuckDBResult *ctx;
-
-#ifdef DUCKDB_API_NO_DEPRECATED
-    return Qtrue;
-#else
-    rb_warn("`DuckDB::Result#streaming?` will be deprecated in the future.");
-    /* FIXME streaming is allways true. so this method is not useful and deprecated. */
-    TypedData_Get_Struct(oDuckDBResult, rubyDuckDBResult, &result_data_type, ctx);
-    return duckdb_result_is_streaming(ctx->result) ? Qtrue : Qfalse;
-#endif
-}
-
 static VALUE destroy_data_chunk(VALUE arg) {
     struct chunk_arg *p = (struct chunk_arg *)arg;
     duckdb_destroy_data_chunk(&(p->chunk));
     return Qnil;
 }
 
-/* :nodoc: */
-static VALUE duckdb_result__chunk_each(VALUE oDuckDBResult) {
-/*
-#ifdef HAVE_DUCKDB_H_GE_V1_0_0
-    return duckdb_result__chunk_stream(oDuckDBResult);
-#else
-*/
-    rubyDuckDBResult *ctx;
-    struct chunk_arg arg;
-    idx_t chunk_count;
-    idx_t chunk_idx;
-
-#ifdef DUCKDB_API_NO_DEPRECATED
-    //TODO: use duckdb_fetch_chunk instead of duckdb_result_chunk_count and duckdb_result_get_chunk.
-    // duckdb_result_chunk_count will be deprecated in the future.
-    // duckdb_result_get_chunk will be deprecated in the future.
-#else
-    TypedData_Get_Struct(oDuckDBResult, rubyDuckDBResult, &result_data_type, ctx);
-
-    arg.col_count = duckdb_column_count(&(ctx->result));
-    chunk_count = duckdb_result_chunk_count(ctx->result);
-
-    RETURN_ENUMERATOR(oDuckDBResult, 0, 0);
-
-    for (chunk_idx = 0; chunk_idx < chunk_count; chunk_idx++) {
-        arg.chunk = duckdb_result_get_chunk(ctx->result, chunk_idx);
-        rb_ensure(yield_rows, (VALUE)&arg, destroy_data_chunk, (VALUE)&arg);
-    }
-#endif
-    return Qnil;
-/*
-#endif
-*/
-}
-
 /* :nodoc: */
 static VALUE duckdb_result__chunk_stream(VALUE oDuckDBResult) {
     rubyDuckDBResult *ctx;
@@ -276,14 +226,7 @@ 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(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
 }
 
 /* :nodoc: */
@@ -491,17 +434,43 @@ static VALUE infinite_timestamp_value(duckdb_timestamp timestamp) {
     return Qnil;
 }
 
+static VALUE infinite_timestamp_s_value(duckdb_timestamp_s timestamp_s) {
+    if (duckdb_is_finite_timestamp_s(timestamp_s) == false) {
+        return rb_funcall(mDuckDBConverter, id__to_infinity, 1,
+                          LL2NUM(timestamp_s.seconds)
+                         );
+    }
+    return Qnil;
+}
+
 static VALUE vector_timestamp_s(void* vector_data, idx_t row_idx) {
-    duckdb_timestamp data = ((duckdb_timestamp *)vector_data)[row_idx];
+    duckdb_timestamp_s data = ((duckdb_timestamp_s *)vector_data)[row_idx];
+    VALUE obj = infinite_timestamp_s_value(data);
+    if (obj != Qnil) {
+        return obj;
+    }
     return rb_funcall(mDuckDBConverter, id__to_time_from_duckdb_timestamp_s, 1,
-                      LL2NUM(data.micros)
-                     );
+                      LL2NUM(data.seconds)
+                      );
+}
+
+static VALUE infinite_timestamp_ms_value(duckdb_timestamp_ms timestamp_ms) {
+    if (duckdb_is_finite_timestamp_ms(timestamp_ms) == false) {
+        return rb_funcall(mDuckDBConverter, id__to_infinity, 1,
+                          LL2NUM(timestamp_ms.millis)
+                         );
+    }
+    return Qnil;
 }
 
 static VALUE vector_timestamp_ms(void* vector_data, idx_t row_idx) {
-    duckdb_timestamp data = ((duckdb_timestamp *)vector_data)[row_idx];
+    duckdb_timestamp_ms data = ((duckdb_timestamp_ms *)vector_data)[row_idx];
+    VALUE obj = infinite_timestamp_ms_value(data);
+    if (obj != Qnil) {
+        return obj;
+    }
     return rb_funcall(mDuckDBConverter, id__to_time_from_duckdb_timestamp_ms, 1,
-                      LL2NUM(data.micros)
+                      LL2NUM(data.millis)
                       );
 }
 
@@ -877,8 +846,6 @@ void rbduckdb_init_duckdb_result(void) {
     rb_define_method(cDuckDBResult, "column_count", duckdb_result_column_count, 0);
     rb_define_method(cDuckDBResult, "rows_changed", duckdb_result_rows_changed, 0);
     rb_define_method(cDuckDBResult, "columns", duckdb_result_columns, 0);
-    rb_define_method(cDuckDBResult, "streaming?", duckdb_result_streaming_p, 0);
-    rb_define_private_method(cDuckDBResult, "_chunk_each", duckdb_result__chunk_each, 0);
     rb_define_private_method(cDuckDBResult, "_chunk_stream", duckdb_result__chunk_stream, 0);
     rb_define_private_method(cDuckDBResult, "_column_type", duckdb_result__column_type, 1);
     rb_define_private_method(cDuckDBResult, "_return_type", duckdb_result__return_type, 0);

data/ext/duckdb/ruby-duckdb.h

@@ -8,12 +8,8 @@
 #include "ruby/thread.h"
 #include <duckdb.h>
 
-#ifdef HAVE_CONST_DUCKDB_TYPE_SQLNULL
-#define HAVE_DUCKDB_H_GE_V1_1_1 1
-#endif
-
-#ifdef HAVE_DUCKDB_CREATE_INSTANCE_CACHE
-#define HAVE_DUCKDB_H_GE_V1_2_0 1
+#ifdef HAVE_DUCKDB_GET_TABLE_NAMES
+#define HAVE_DUCKDB_H_GE_V1_3_0 1
 #endif
 
 #include "./error.h"
@@ -31,10 +27,7 @@
 #include "./blob.h"
 #include "./appender.h"
 #include "./config.h"
-
-#ifdef HAVE_DUCKDB_H_GE_V1_2_0
 #include "./instance_cache.h"
-#endif
 
 extern VALUE mDuckDB;
 extern VALUE cDuckDBDatabase;
@@ -46,9 +39,6 @@ extern VALUE mDuckDBConverter;
 extern VALUE cDuckDBPreparedStatement;
 extern VALUE PositiveInfinity;
 extern VALUE NegativeInfinity;
-
-#ifdef HAVE_DUCKDB_H_GE_V1_2_0
 extern VALUE cDuckDBInstanceCache;
-#endif
 
 #endif

data/lib/duckdb/connection.rb

@@ -81,10 +81,9 @@ module DuckDB
     #   result = pending_result.execute_pending
     #   result.each.first
     def async_query_stream(sql, *args, **kwargs)
-      prepare(sql) do |stmt|
-        stmt.bind_args(*args, **kwargs)
-        stmt.pending_prepared_stream
-      end
+      warn("`#{self.class}#{__method__}` will be deprecated. Use `#{self.class}#async_query` instead.")
+
+      async_query(sql, *args, **kwargs)
     end
 
     # connects DuckDB database

data/lib/duckdb/prepared_statement.rb

@@ -52,7 +52,8 @@ module DuckDB
     end
 
     def pending_prepared_stream
-      PendingResult.new(self, true)
+      warn("`#{self.class}##{__method__}` will be deprecated. use `#{self.class}#pending_prepared` instead")
+      pending_prepared
     end
 
     # returns statement type. The return value is one of the following symbols:

data/lib/duckdb/result.rb

@@ -28,36 +28,16 @@ module DuckDB
 
     alias column_size column_count
 
-    @use_chunk_each = false
-
     class << self
       def new
         raise DuckDB::Error, 'DuckDB::Result cannot be instantiated directly.'
       end
-
-      attr_writer :use_chunk_each
-
-      def use_chunk_each?
-        @use_chunk_each
-      end
     end
 
     def each(&)
-      if self.class.use_chunk_each?
-        return chunk_each unless block_given?
-
-        chunk_each(&)
-      else
-        return _chunk_stream unless block_given?
-
-        _chunk_stream(&)
-      end
-    end
+      return _chunk_stream unless block_given?
 
-    # :nodoc:
-    def chunk_each(&)
-      warn 'DuckDB::Result#chunk_each will be deprecated.'
-      _chunk_each(&)
+      _chunk_stream(&)
     end
 
     # returns return type. The return value is one of the following symbols:

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.2.2.0'
+  VERSION = '1.3.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 1.2.2.0
+  version: 1.3.1.0
 platform: ruby
 authors:
 - Masaki Suketa