duckdb 1.1.0.0 → 1.1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17d405dc19edeb4bbdea3da427974d5a3904fb2f10536fae4494fa284bebd8ff
-  data.tar.gz: 8f26f51c5d14d8854009619916008a8742ebf09f351e5e8f025ccc2fad9ccf13
+  metadata.gz: 84935b6317fa4bef4b62197645f061b179e3358e93cba3b976672eb1988715fc
+  data.tar.gz: 7ff6b2f4b46ea16bcfa2e7de486e9a5bb30aa7d4dccb14e32af7b9886d6fcac4
 SHA512:
-  metadata.gz: 6a15f0763765f35dc5c86cde1425acc6c1e001bec99fd3901aeeeaf74ca94d3af9ad9905be43c8b2a7c0eb3b87a68d20945f25063c8a2e77ba527e54c3c8d49e
-  data.tar.gz: 0061c636c7d80629677b27cab21b173690b8e7aed3f8f8df86783632e92bca9a7349ae80e2e6cb32b04ea356c61c31a9abfdd15da1b05b138f3de186411c5969
+  metadata.gz: d90dbdbf57d5cc282049f6297d00674ff57d9fafbfd7bfab8db8c87fb1153d3c9ea93ceda3b440d066c24ceef5dd1e349dedea6f4b17557bda590bb92f93fc5a
+  data.tar.gz: cbcbd5c50c6ddc92c01001b36cbe5aad8a87729ea5518a881dcf8c21621679d1c3740c0ed97672d597aca351ea09548d6f7b5e722fde32077cb811a57c3dfd40

data/.github/workflows/test_on_macos.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: ['3.1.6', '3.2.4', '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-preview1', 'head']
+        duckdb: ['1.1.1', '1.1.0', '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.4', '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-preview1', 'head']
+        duckdb: ['1.1.1', '1.1.0', '1.0.0']
 
     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.1.5', '3.2.4', '3.3.4', 'ucrt', 'mingw', 'mswin', 'head']
-        duckdb: ['1.1.0', '1.0.0', '0.10.3']
+        ruby: ['3.1.6', '3.2.5', '3.3.5', 'ucrt', 'mingw', 'mswin', 'head']
+        duckdb: ['1.1.1', '1.1.0', '1.0.0']
 
     steps:
     - uses: actions/checkout@v4

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
 All notable changes to this project will be documented in this file.
+# Unreleased
+
+# 1.1.1.0 - 2024-10-06
+- bump duckdb 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`.
 
 # 1.1.0.0 - 2024-09-15
 - drop ruby 3.0.x.
@@ -31,7 +40,7 @@ All notable changes to this project will be documented in this file.
 ## Breaking changes
 - drop duckdb v0.9.x.
   - skip to check duckdb_parameter_name is available.
-- The following methods are deprecated.
+- The following methods are obsoleted.
   - `DuckDB::Result#_null?`
   - `DuckDB::Result#_to_boolean`
   - `DuckDB::Result#_to_smallint`

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.1
 
 RUN apt update -qq && \
     apt install -y build-essential curl git wget

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    duckdb (1.1.0.0)
+    duckdb (1.1.1.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/README.md

@@ -113,7 +113,19 @@ 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.

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/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

@@ -97,6 +97,14 @@ module DuckDB
     # returns PreparedStatement object.
     # The first argument is SQL string.
     #
+    #   require 'duckdb'
+    #   db = DuckDB::Database.open('duckdb_file')
+    #   con = db.connect
+    #
+    #   sql = 'SELECT * FROM users WHERE name = $name AND email = $email'
+    #   stmt = con.prepared_statement(sql)
+    #   stmt.bind_args(name: 'Dave', email: 'dave@example.com')
+    #   result = stmt.execute
     def prepared_statement(str)
       PreparedStatement.new(self, str)
     end
@@ -126,5 +134,6 @@ module DuckDB
     alias async_execute async_query
     alias open connect
     alias close disconnect
+    alias prepare prepared_statement
   end
 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.0'
+  VERSION = '1.1.1.0'
 end

metadata

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