duckdb 1.0.0.2 → 1.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a632e159017449943e06edae0808189967be14845c29b479cb77a0d9e6b9da7
-  data.tar.gz: ec7b9c0f6d34aa943436e9525e914759dbd775d8c9a02b1eff991e2a03ade249
+  metadata.gz: 874174344b2be8ad2eba6fa1e89d2c96827a7e53e0982bacaa7a804b1ee8cf0b
+  data.tar.gz: 9d57293bc3dc59cc10ad7a23ae8e0b8ed4944524c83ecd3e5e9503c6f460d73f
 SHA512:
-  metadata.gz: e50c031a4d9f38a87eb77996c90f90a36c4c5f840694bad4a7ce79dcf3d2e439b30fee8e41a21522285ff7db5293e6fa059186c958f7fbed99089455b4ea04db
-  data.tar.gz: 65b7187a73f43b89a8ec8997edcce562af456e3b89f697b4e25c23ae114ed712916643d39c81ef323a1b47b6ac4783e384c53477d177a9d73271859e31c0f970
+  metadata.gz: b8739a162ec00fb0bb98e13d4f9adecb8f3230e2b4fa81067a128ce4f9db4456b76fe825652ba09b46a5c05fb1f7637a762f369f28f9d7d9423649f7e646b7f0
+  data.tar.gz: 3b564b2aa68cbfcc5eec96d9cc4dd038749d172b28b2329ba20af14610bc1db34a270d3034688dfdf852b26edd0a711d803886e3d731619848d5cd5e6ca331be

data/.github/workflows/test_on_macos.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: ['3.0.7', '3.1.6', '3.2.4', '3.3.3', '3.4.0-preview1', 'head']
-        duckdb: ['1.0.0', '0.10.3']
+        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']
 
     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.0.7', '3.1.6', '3.2.4', '3.3.3', '3.4.0-preview1', 'head']
-        duckdb: ['1.0.0', '0.10.3']
+        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']
 
     steps:
     - uses: actions/checkout@v4

data/.github/workflows/test_on_windows.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: ['3.0.7', '3.1.5', '3.2.4', '3.3.2', 'ucrt', 'mingw', 'mswin', 'head']
-        duckdb: ['1.0.0', '0.10.3']
+        ruby: ['3.1.6', '3.2.5', '3.3.5', 'ucrt', 'mingw', 'mswin', 'head']
+        duckdb: ['1.1.0', '1.0.0', '0.10.3']
 
     steps:
     - uses: actions/checkout@v4

data/CHANGELOG.md

@@ -1,8 +1,63 @@
 # Changelog
 
 All notable changes to this project will be documented in this file.
+# Unreleased
+
+# 1.1.0.1 - 2024-09-21
+- add `DuckDB::Connection#prepare`. `DuckDB::Connection#prepare` is an alias of `DuckDB::Connection#prepared_statement`.
+
+# 1.1.0.0 - 2024-09-15
+- drop ruby 3.0.x.
+- bump duckdb to 1.1.0.
+- Add `DuckDB::PendingResult#execute_check_state` to check the state of the pending result.
+- Add `DuckDB::PreparedStatement#clear_bindings` to clear all bindings.
+- Add `DuckDB::PreparedStatement#param_type` to get the type of the paramerter type.
+  - The return value is one of the `:invalid`, `:boolean`, `:tinyint`, `:smallint`, `:integer`, `:bigint`, `:utinyint`,
+    `:usmallint`, `:uinteger`, `:ubigint`, `:float`, `:double`, `:timestamp`, `:date`, `:time`, `:interval`, `:hugeint`,
+    `:uhugeint`, `:varchar`, `:blob`, `:decimal`, `:timestamp_s`, `:timestamp_ms`, `:timestamp_ns`, `:enum`, `:list`,
+    `:struct`, `:map`, `:array`, `:uuid`, `:union`, `:bit`, `:time_tz`, `:timestamp_tz`.
+- Add `DuckDB::PreparedStatement#statement_type` to get the type of the statement.
+  - The return value is one of the `:invalid`, `:select`, `:insert`, `:update`, `:explain`, `:delete`, `:prepare`, `:create`,
+    `:execute`, `:alter`, `:transaction`, `:copy`, `:analyze`, `:variable_set`, `:create_func`,
+    `:drop`, `:export`, `:pragma`, `:vacuum`, `:call`, `:set`, `:load`, `:relation`, `:extension`,
+    `:logical_plan`, `:attach`, `:detach`, `:multi`.
+- Add `DuckDB::Result#statement_type` to get the return type of the statement.
+  - The return value is one of the `:invalid`, `:select`, `:insert`, `:update`, `:explain`, `:delete`, `:prepare`, `:create`,
+    `:execute`, `:alter`, `:transaction`, `:copy`, `:analyze`, `:variable_set`, `:create_func`,
+    `:drop`, `:export`, `:pragma`, `:vacuum`, `:call`, `:set`, `:load`, `:relation`, `:extension`,
+    `:logical_plan`, `:attach`, `:detach`, `:multi`.
+- Add `DuckDB::Result#return_type` to get the return type of the result.
+  - The return value is one of the `:invalid`, `:query_result`, `:rows_changed`, `:nothing`.
+- The following method will be deprecated.
+  - `DuckDB::Result#use_chunk_each?`
+  - `DuckDB::Result#use_chunk_each=`
 
-## Unreleased
+## Breaking changes
+- drop duckdb v0.9.x.
+  - skip to check duckdb_parameter_name is available.
+- The following methods are obsoleted.
+  - `DuckDB::Result#_null?`
+  - `DuckDB::Result#_to_boolean`
+  - `DuckDB::Result#_to_smallint`
+  - `DuckDB::Result#_to_utinyint`
+  - `DuckDB::Result#_to_integer`
+  - `DuckDB::Result#_to_bigint`
+  - `DuckDB::Result#_to_hugeint`
+  - `DuckDB::Result#_to_hugeint_internal`
+  - `DuckDB::Result#__to_hugeint_internal`
+  - `DuckDB::Result#_to_decimal`
+  - `DuckDB::Result#_to_decimal_internal`
+  - `DuckDB::Result#__to_decimal_internal`
+  - `DuckDB::Result#_to_float`
+  - `DuckDB::Result#_to_double`
+  - `DuckDB::Result#_to_string`
+  - `DuckDB::Result#_to_string_internal`
+  - `DuckDB::Result#_to_blob`
+  - `DuckDB::Result#to_value`
+  - `DuckDB::Result#row`
+- `DuckDB::Result#use_chunk_each?` is always true.
+- `DuckDB::Result#use_chunk_each=` always ignores the argument.
+- `DuckDB::Result#each` always works the same as `DuckDB::Result#chunk_each`.
 
 # 1.0.0.2 - 2024-06-23
 - DuckDB::Result supports TIMESTAMPTZ column type (only when DuckDB::Result.use_chunk_each is true).

data/Dockerfile

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

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    duckdb (1.0.0.2)
+    duckdb (1.1.0.1)
       bigdecimal (>= 3.1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    benchmark-ips (2.13.0)
+    benchmark-ips (2.14.0)
     bigdecimal (3.1.8)
     mini_portile2 (2.8.7)
-    minitest (5.24.0)
-    nokogiri (1.16.6)
+    minitest (5.25.1)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    racc (1.8.0)
+    racc (1.8.1)
     rake (13.2.1)
     rake-compiler (1.2.7)
       rake

data/README.md

@@ -113,15 +113,24 @@ con.query('SELECT * FROM users WHERE name = ? AND email = ?', 'Alice', 'alice@ex
 # or
 con.query('SELECT * FROM users WHERE name = $name AND email = $email', name: 'Alice', email: 'alice@example.com')
 ```
+### Using prepared statement
 
+You can use prepared statement.
+
+```ruby
+stmt = con.prepare('SELECT * FROM users WHERE name = $name AND email = $email')
+# or
+# stmt = con.prepared_statement('SELECT * FROM users WHERE name = $name AND email = $email')
+# or
+# stmt = DuckDB::PreparedStatement.new(con, 'SELECT * FROM users WHERE name = $name AND email = $email')
+stmt.bind(name: 'Alice', email: 'alice@example.com')
+result = stmt.execute
+```
 ### Using async query
 
 You can use async query.
 
 ```ruby
-DuckDB::Result.use_chunk_each = true
-...
-
 pending_result = con.async_query_stream('SLOW QUERY')
 pending_result.execute_task while pending_result.state == :not_ready
 

data/benchmark/async_query.rb

@@ -2,8 +2,6 @@ require 'bundler/setup'
 require 'duckdb'
 require 'benchmark/ips'
 
-
-DuckDB::Result.use_chunk_each = true
 DuckDB::Database.open do |db|
   db.connect do |con|
     con.query('SET threads=1')

data/benchmark/to_intern_ips.rb

@@ -4,7 +4,6 @@ require 'bundler/setup'
 require 'duckdb'
 require 'benchmark/ips'
 
-DuckDB::Result.use_chunk_each = true
 db = DuckDB::Database.open
 con = db.connect
 con.query(<<~SQL

data/duckdb.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
   spec.extensions    = ['ext/duckdb/extconf.rb']
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.1.0'
   spec.add_dependency 'bigdecimal', '>= 3.1.4'
 
   spec.add_development_dependency 'bundler', '~> 2.3'

data/ext/duckdb/duckdb.c

@@ -1,6 +1,8 @@
 #include "ruby-duckdb.h"
 
 VALUE mDuckDB;
+VALUE PositiveInfinity;
+VALUE NegativeInfinity;
 
 static VALUE duckdb_s_library_version(VALUE self);
 
@@ -19,6 +21,8 @@ static VALUE duckdb_s_library_version(VALUE self) {
 void
 Init_duckdb_native(void) {
     mDuckDB = rb_define_module("DuckDB");
+    PositiveInfinity = rb_str_new_literal("infinity");
+    NegativeInfinity = rb_str_new_literal("-infinity");
 
     rb_define_singleton_method(mDuckDB, "library_version", duckdb_s_library_version, 0);
 

data/ext/duckdb/extconf.rb

@@ -2,7 +2,7 @@
 
 require 'mkmf'
 
-DUCKDB_REQUIRED_VERSION = '0.9.0'
+DUCKDB_REQUIRED_VERSION = '0.10.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_bind_parameter_index', DUCKDB_REQUIRED_VERSION)
-
-# check duckdb >= 0.9.0
-have_func('duckdb_bind_parameter_index', 'duckdb.h')
+check_duckdb_library('duckdb', 'duckdb_appender_column_count', DUCKDB_REQUIRED_VERSION)
 
 # check duckdb >= 0.10.0
 have_func('duckdb_appender_column_count', 'duckdb.h')
@@ -67,8 +64,8 @@ have_func('duckdb_appender_column_count', 'duckdb.h')
 # check duckdb >= 1.0.0
 have_func('duckdb_fetch_chunk', 'duckdb.h')
 
-# duckdb_parameter_name in duckdb <= 0.9.1 is not found on Windows.
-have_func('duckdb_parameter_name', 'duckdb.h')
+# check duckdb >= 1.1.0
+have_func('duckdb_result_error_type', 'duckdb.h')
 
 $CFLAGS << ' -DDUCKDB_API_NO_DEPRECATED' if ENV['DUCKDB_API_NO_DEPRECATED']
 

data/ext/duckdb/pending_result.c

@@ -10,6 +10,7 @@ static VALUE duckdb_pending_result_execute_task(VALUE self);
 static VALUE duckdb_pending_result_execute_pending(VALUE self);
 static VALUE duckdb_pending_result_execution_finished_p(VALUE self);
 static VALUE duckdb_pending_result__state(VALUE self);
+static VALUE duckdb_pending_result__execute_check_state(VALUE self);
 
 static const rb_data_type_t pending_result_data_type = {
     "DuckDB/PendingResult",
@@ -128,6 +129,11 @@ static VALUE duckdb_pending_result__state(VALUE self) {
     return INT2FIX(ctx->state);
 }
 
+static VALUE duckdb_pending_result__execute_check_state(VALUE self) {
+    rubyDuckDBPendingResult *ctx = get_struct_pending_result(self);
+    return INT2FIX(duckdb_pending_execute_check_state(ctx->pending_result));
+}
+
 rubyDuckDBPendingResult *get_struct_pending_result(VALUE obj) {
     rubyDuckDBPendingResult *ctx;
     TypedData_Get_Struct(obj, rubyDuckDBPendingResult, &pending_result_data_type, ctx);
@@ -143,4 +149,5 @@ void rbduckdb_init_duckdb_pending_result(void) {
     rb_define_method(cDuckDBPendingResult, "execute_pending", duckdb_pending_result_execute_pending, 0);
     rb_define_method(cDuckDBPendingResult, "execution_finished?", duckdb_pending_result_execution_finished_p, 0);
     rb_define_private_method(cDuckDBPendingResult, "_state", duckdb_pending_result__state, 0);
+    rb_define_private_method(cDuckDBPendingResult, "_execute_check_state", duckdb_pending_result__execute_check_state, 0);
 }

data/ext/duckdb/prepared_statement.c

@@ -11,10 +11,8 @@ static VALUE duckdb_prepared_statement_execute(VALUE self);
 static idx_t check_index(VALUE vidx);
 
 static VALUE duckdb_prepared_statement_bind_parameter_index(VALUE self, VALUE name);
-#ifdef HAVE_DUCKDB_PARAMETER_NAME
 static VALUE duckdb_prepared_statement_parameter_name(VALUE self, VALUE vidx);
-#endif
-
+static VALUE duckdb_prepared_statement_clear_bindings(VALUE self);
 static VALUE duckdb_prepared_statement_bind_bool(VALUE self, VALUE vidx, VALUE val);
 static VALUE duckdb_prepared_statement_bind_int8(VALUE self, VALUE vidx, VALUE val);
 static VALUE duckdb_prepared_statement_bind_int16(VALUE self, VALUE vidx, VALUE val);
@@ -25,6 +23,8 @@ static VALUE duckdb_prepared_statement_bind_double(VALUE self, VALUE vidx, VALUE
 static VALUE duckdb_prepared_statement_bind_varchar(VALUE self, VALUE vidx, VALUE str);
 static VALUE duckdb_prepared_statement_bind_blob(VALUE self, VALUE vidx, VALUE blob);
 static VALUE duckdb_prepared_statement_bind_null(VALUE self, VALUE vidx);
+static VALUE duckdb_prepared_statement__statement_type(VALUE self);
+static VALUE duckdb_prepared_statement__param_type(VALUE self, VALUE vidx);
 static VALUE duckdb_prepared_statement__bind_date(VALUE self, VALUE vidx, VALUE year, VALUE month, VALUE day);
 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);
@@ -125,7 +125,6 @@ static VALUE duckdb_prepared_statement_bind_parameter_index(VALUE self, VALUE na
     return ULL2NUM(idx);
 }
 
-#ifdef HAVE_DUCKDB_PARAMETER_NAME
 static VALUE duckdb_prepared_statement_parameter_name(VALUE self, VALUE vidx) {
     rubyDuckDBPreparedStatement *ctx;
     VALUE vname;
@@ -142,7 +141,23 @@ static VALUE duckdb_prepared_statement_parameter_name(VALUE self, VALUE vidx) {
     duckdb_free((void *)name);
     return vname;
 }
-#endif /* HAVE_DUCKDB_PARAMETER_NAME */
+
+/*
+ *  call-seq:
+ *    prepared_statement.clear_bindings -> DuckDB::PreparedStatement
+ *
+ *  clear all bindings of prepared statement.
+ */
+static VALUE duckdb_prepared_statement_clear_bindings(VALUE self) {
+    rubyDuckDBPreparedStatement *ctx;
+    TypedData_Get_Struct(self, rubyDuckDBPreparedStatement, &prepared_statement_data_type, ctx);
+
+    if (duckdb_clear_bindings(ctx->prepared_statement) == DuckDBError) {
+        const char *error = duckdb_prepare_error(ctx->prepared_statement);
+        rb_raise(eDuckDBError, "fail to clear bindings. %s", error);
+    }
+    return self;
+}
 
 static VALUE duckdb_prepared_statement_bind_bool(VALUE self, VALUE vidx, VALUE val) {
     rubyDuckDBPreparedStatement *ctx;
@@ -273,6 +288,18 @@ static VALUE duckdb_prepared_statement_bind_null(VALUE self, VALUE vidx) {
     return self;
 }
 
+static VALUE duckdb_prepared_statement__statement_type(VALUE self) {
+    rubyDuckDBPreparedStatement *ctx;
+    TypedData_Get_Struct(self, rubyDuckDBPreparedStatement, &prepared_statement_data_type, ctx);
+    return INT2FIX(duckdb_prepared_statement_type(ctx->prepared_statement));
+}
+
+static VALUE duckdb_prepared_statement__param_type(VALUE self, VALUE vidx) {
+    rubyDuckDBPreparedStatement *ctx;
+    TypedData_Get_Struct(self, rubyDuckDBPreparedStatement, &prepared_statement_data_type, ctx);
+    return INT2FIX(duckdb_param_type(ctx->prepared_statement, NUM2ULL(vidx)));
+}
+
 static VALUE duckdb_prepared_statement__bind_date(VALUE self, VALUE vidx, VALUE year, VALUE month, VALUE day) {
     rubyDuckDBPreparedStatement *ctx;
     duckdb_date dt;
@@ -366,11 +393,8 @@ void rbduckdb_init_duckdb_prepared_statement(void) {
     rb_define_method(cDuckDBPreparedStatement, "execute", duckdb_prepared_statement_execute, 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);
-
-#ifdef HAVE_DUCKDB_PARAMETER_NAME
     rb_define_method(cDuckDBPreparedStatement, "parameter_name", duckdb_prepared_statement_parameter_name, 1);
-#endif
-
+    rb_define_method(cDuckDBPreparedStatement, "clear_bindings", duckdb_prepared_statement_clear_bindings, 0);
     rb_define_method(cDuckDBPreparedStatement, "bind_bool", duckdb_prepared_statement_bind_bool, 2);
     rb_define_method(cDuckDBPreparedStatement, "bind_int8", duckdb_prepared_statement_bind_int8, 2);
     rb_define_method(cDuckDBPreparedStatement, "bind_int16", duckdb_prepared_statement_bind_int16, 2);
@@ -381,6 +405,8 @@ void rbduckdb_init_duckdb_prepared_statement(void) {
     rb_define_method(cDuckDBPreparedStatement, "bind_varchar", duckdb_prepared_statement_bind_varchar, 2);
     rb_define_method(cDuckDBPreparedStatement, "bind_blob", duckdb_prepared_statement_bind_blob, 2);
     rb_define_method(cDuckDBPreparedStatement, "bind_null", duckdb_prepared_statement_bind_null, 1);
+    rb_define_private_method(cDuckDBPreparedStatement, "_statement_type", duckdb_prepared_statement__statement_type, 0);
+    rb_define_private_method(cDuckDBPreparedStatement, "_param_type", duckdb_prepared_statement__param_type, 1);
     rb_define_private_method(cDuckDBPreparedStatement, "_bind_date", duckdb_prepared_statement__bind_date, 4);
     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);