duckdb 1.3.0.0 → 1.3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 419a694a8223198ebddb3470cddc96c164fa684ebde604edf5d0df401376c0d5
-  data.tar.gz: c832f287dc1fa48532d2b69dc49c0de13f5d9f2811a49cf3dcd5ba23f985be71
+  metadata.gz: 979c1ffbe5e1137870bd777377ef16cb7ddde8499d5d9fd14fcd6a5fe401ffda
+  data.tar.gz: 72d970b664aed935c451a95e48818584cf0ecd029ade167bef88235eed62fc6c
 SHA512:
-  metadata.gz: e48b21a62da9e1dff74bc2b2ecc775e93c1fbd01691bed443fd04686875e6b5285a4f4d61ea7befb961bbc2c98c610caa0da712fdbd339b3b5efe83d07c4bfc3
-  data.tar.gz: 06f7a29029833de5f912343432c8391cecb3404c0069b14d190617291634f790ea55433f5178d9114bd6f7e4a2c7729ce9b808343c48d820842f96fa771bbe22
+  metadata.gz: cfb967f5ce29966491958e8e0c724716eacb7d36e0692a522b01ebca148e26ae5306cbc9306d64299fec16e79f96967863dad73cdc2c0d77bf4382bacfd25a00
+  data.tar.gz: 9a1edecd631f9b7e891b49afd71eea1baebdf1defc6488222469b6e435ce39510ecfaadcb3329d387500bbf49d87ac3344ac11ffb17ffb257836c6c6007b5811

data/.github/workflows/test_on_macos.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['3.2.7', '3.3.8', '3.4.2', 'head', '3.5.0-preview1']
-        duckdb: ['1.2.2', '1.1.3', '1.1.1', '1.3.0']
+        duckdb: ['1.2.2', '1.3.1']
 
     steps:
     - uses: actions/checkout@v4

data/.github/workflows/test_on_ubuntu.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['3.2.7', '3.3.8', '3.4.2', 'head', '3.5.0-preview1']
-        duckdb: ['1.2.2', '1.1.3', '1.1.1', '1.3.0']
+        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.8', '3.4.1', 'ucrt', 'mingw', 'mswin', 'head']
-        ruby: ['3.2.6', '3.3.8', '3.4.1', 'ucrt', 'mingw', 'mswin']
-        duckdb: ['1.2.2', '1.1.3', '1.1.1', '1.3.0']
+        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

@@ -2,7 +2,10 @@
 
 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.

data/Dockerfile

@@ -1,7 +1,7 @@
 ARG RUBY_VERSION=3.4.4
 FROM ruby:${RUBY_VERSION}
 
-ARG DUCKDB_VERSION=1.3.0
+ARG DUCKDB_VERSION=1.3.1
 ARG VALGRIND_VERSION=3.21.0
 
 RUN apt-get update -qq && \

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    duckdb (1.3.0.0)
+    duckdb (1.3.1.0)
       bigdecimal (>= 3.1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     benchmark-ips (2.14.0)
-    bigdecimal (3.2.0)
+    bigdecimal (3.2.2)
     mini_portile2 (2.8.9)
     minitest (5.25.5)
     nokogiri (1.18.8)

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,10 +56,7 @@ 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')
@@ -67,10 +64,6 @@ have_func('duckdb_create_instance_cache', 'duckdb.h')
 # check duckdb >= 1.3.0
 have_func('duckdb_get_table_names', '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/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/result.c

@@ -48,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);
@@ -223,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: */
@@ -438,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)
                       );
 }
 

data/ext/duckdb/ruby-duckdb.h

@@ -8,14 +8,6 @@
 #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
-#endif
-
 #ifdef HAVE_DUCKDB_GET_TABLE_NAMES
 #define HAVE_DUCKDB_H_GE_V1_3_0 1
 #endif
@@ -35,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;
@@ -50,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/version.rb

@@ -3,5 +3,5 @@
 module DuckDB
   # The version string of ruby-duckdb.
   # Currently, ruby-duckdb is NOT semantic versioning.
-  VERSION = '1.3.0.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.3.0.0
+  version: 1.3.1.0
 platform: ruby
 authors:
 - Masaki Suketa