duckdb 1.1.2.1 → 1.1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f326104e9d96a1fce6a508d481101c37eca2b12a421eb2ddb07acb838f14c118
-  data.tar.gz: 999db21104bb772564ecb41bbc2fee06d728f65618bb8538d14bc20c22173424
+  metadata.gz: 97d0a0fdf67bcfdd00102540f9dd675e1fe87176e349ef06db6f1c72f78b5219
+  data.tar.gz: da34340b078ae95c6b9fa7ddb872de4be16f3bc298169004761d532a9f378f20
 SHA512:
-  metadata.gz: 6cb7f30f39a2b768d1d6441e324f2c86f910f7af2cff9ca403b91eeb13cacbc0bee56dc54d3786f58e27af9276ae91d4a2ce22c705727b0c8ef5cd3251ab83fe
-  data.tar.gz: f17ea13a5aca9640e17e8983a37f9ba88e6ace381d5ad7e979232b0158028b92aa07ddea758ffdd9868511fb2b868354f7f15c20d6c14fb4f2e537613f8ee670
+  metadata.gz: 924d05547e0f9bf6f4772db3a93085930cd48961a0eee92d114815ea8286cd4ad6d1454764ffd97caa0cc6be103a2b084d1f402e98a973dc529b674754b4cfd7
+  data.tar.gz: 022f30d9b659b487f109d91b7d9818a26bb6d0a7fffd62fc8ae0375453688b3981b652fcb00826a826f15503ee119ca73830fe251329d51235d46ffa6c17ff50

data/.github/workflows/test_on_macos.yml

@@ -15,8 +15,9 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        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']
+        # ruby: ['3.1.6', '3.2.6', '3.3.6', '3.4.0-preview2', 'head']
+        ruby: ['3.1.6', '3.2.6', '3.3.6', '3.4.0-preview2']
+        duckdb: ['1.1.3', '1.1.1', '1.0.0']
 
     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.1.6', '3.2.5', '3.3.5', '3.4.0-preview2', 'head']
-        duckdb: ['1.1.2', '1.1.1', '1.0.0']
+        ruby: ['3.1.6', '3.2.6', '3.3.6', '3.4.0-preview2', 'head']
+        duckdb: ['1.1.3', '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.2', '1.1.1', '1.0.0']
+        duckdb: ['1.1.3', '1.1.1', '1.0.0']
 
     steps:
     - uses: actions/checkout@v4

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 # Unreleased
+# 1.1.3.1 - 2024-11-27
+- fix to `DuckDB::Connection#query` with multiple SQL statements. Calling PreparedStatement#destroy after each statement executed.
+- install valgrind in docker development environment.
+- add `DuckDB::Appender#append_default`.
+
+# 1.1.3.0 - 2024-11-10
+- add `DuckDB::PreparedStatement#bind_decimal`. (Thanks to @otegami)
+- bump duckdb to 1.1.3.
 
 # 1.1.2.1 - 2024-11-04
 - `DuckDB::Connection#query` accepts multiple SQL statement.

data/Dockerfile

@@ -1,21 +1,32 @@
-ARG RUBY_VERSION=3.3.5
+ARG RUBY_VERSION=3.3.6
 FROM ruby:${RUBY_VERSION}
 
-ARG DUCKDB_VERSION=1.1.2
+ARG DUCKDB_VERSION=1.1.3
+ARG VALGRIND_VERSION=3.21.0
 
 RUN apt update -qq && \
-    apt install -y build-essential curl git wget
+    apt install -y build-essential curl git wget libc6-dbg
 
 COPY getduckdb.sh .
 RUN ./getduckdb.sh
 
-RUN unzip duckdb.zip -d libduckdb
-RUN mv libduckdb/duckdb.* /usr/local/include
-RUN mv libduckdb/libduckdb.so /usr/local/lib
-RUN ldconfig /usr/local/lib
+RUN unzip duckdb.zip -d libduckdb && \
+    mv libduckdb/duckdb.* /usr/local/include && \
+    mv libduckdb/libduckdb.so /usr/local/lib && \
+    ldconfig /usr/local/lib
+
+RUN mkdir valgrind-tmp && \
+    cd valgrind-tmp && \
+    wget https://sourceware.org/pub/valgrind/valgrind-${VALGRIND_VERSION}.tar.bz2 && \
+    tar xf valgrind-${VALGRIND_VERSION}.tar.bz2 && \
+    cd valgrind-${VALGRIND_VERSION} && \
+    ./configure && \
+    make -s && \
+    make -s install && \
+    cd .. && \
+    rm -rf /valgrind-tmp
 
 COPY . /root/ruby-duckdb
 WORKDIR /root/ruby-duckdb
 RUN git config --global --add safe.directory /root/ruby-duckdb
-RUN bundle install
-RUN rake build
+RUN bundle install && rake build

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    duckdb (1.1.2.1)
+    duckdb (1.1.3.1)
       bigdecimal (>= 3.1.4)
 
 GEM
@@ -9,10 +9,16 @@ GEM
   specs:
     benchmark-ips (2.14.0)
     bigdecimal (3.1.8)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
-    nokogiri (1.16.7)
-      mini_portile2 (~> 2.8.2)
+    minitest (5.25.2)
+    nokogiri (1.16.7-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
@@ -25,7 +31,11 @@ GEM
     stackprof (0.2.26)
 
 PLATFORMS
-  ruby
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
@@ -39,4 +49,4 @@ DEPENDENCIES
   stackprof
 
 BUNDLED WITH
-   2.5.9
+   2.5.22

data/README.md

@@ -46,7 +46,7 @@ brew install duckdb
 
 Using [Ruby + Devkit](https://rubyinstaller.org/downloads/) is recommended.
 
-1. Download libduckdb-windows-amd64.zip from [DuckDB](https://github.com/duckdb/duckdb/releases) and extranct it.
+1. Download libduckdb-windows-amd64.zip from [DuckDB](https://github.com/duckdb/duckdb/releases) and extract it.
 2. Copy `duckdb.dll` into `C:\Windows\System32`
 
 ## How to install
@@ -115,7 +115,7 @@ con.query('SELECT * FROM users WHERE name = $name AND email = $email', name: 'Al
 ```
 ### Using prepared statement
 
-You can use prepared statement.
+You can use prepared statement. Prepared statement object is created by `Connection#prepare` method or `DuckDB::PreparedStatement.new`.
 
 ```ruby
 stmt = con.prepare('SELECT * FROM users WHERE name = $name AND email = $email')
@@ -125,7 +125,20 @@ stmt = con.prepare('SELECT * FROM users WHERE name = $name AND email = $email')
 # 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
+stmt.destroy
 ```
+You must call `PreparedStatement#destroy` method after using prepared statement. Otherwise, automatically destroyed
+when the PreparedStatement object is garbage collected.
+
+Instead of calling `PreparedStatement#destroy`, you can use block.
+
+```ruby
+result = con.prepare('SELECT * FROM users WHERE name = $name AND email = $email') do |stmt|
+           stmt.bind(name: 'Alice', email: 'alice@example.com')
+           stmt.execute
+         end
+```
+
 ### Using async query
 
 You can use async query.

data/ext/duckdb/appender.c

@@ -23,6 +23,11 @@ static VALUE appender_append_varchar(VALUE self, VALUE val);
 static VALUE appender_append_varchar_length(VALUE self, VALUE val, VALUE len);
 static VALUE appender_append_blob(VALUE self, VALUE val);
 static VALUE appender_append_null(VALUE self);
+
+#ifdef HAVE_DUCKDB_H_GE_V1_1_0
+static VALUE appender_append_default(VALUE self);
+#endif
+
 static VALUE appender__append_date(VALUE self, VALUE yearval, VALUE monthval, VALUE dayval);
 static VALUE appender__append_interval(VALUE self, VALUE months, VALUE days, VALUE micros);
 static VALUE appender__append_time(VALUE self, VALUE hour, VALUE min, VALUE sec, VALUE micros);
@@ -281,6 +286,18 @@ static VALUE appender_append_null(VALUE self) {
     return self;
 }
 
+#ifdef HAVE_DUCKDB_H_GE_V1_1_0
+static VALUE appender_append_default(VALUE self) {
+    rubyDuckDBAppender *ctx;
+    TypedData_Get_Struct(self, rubyDuckDBAppender, &appender_data_type, ctx);
+
+    if (duckdb_append_default(ctx->appender) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+#endif
+
 static VALUE appender__append_date(VALUE self, VALUE year, VALUE month, VALUE day) {
     duckdb_date dt;
     rubyDuckDBAppender *ctx;
@@ -406,6 +423,11 @@ void rbduckdb_init_duckdb_appender(void) {
     rb_define_method(cDuckDBAppender, "append_varchar_length", appender_append_varchar_length, 2);
     rb_define_method(cDuckDBAppender, "append_blob", appender_append_blob, 1);
     rb_define_method(cDuckDBAppender, "append_null", appender_append_null, 0);
+
+#ifdef HAVE_DUCKDB_H_GE_V1_1_0
+    rb_define_method(cDuckDBAppender, "append_default", appender_append_default, 0);
+#endif
+
     rb_define_private_method(cDuckDBAppender, "_append_date", appender__append_date, 3);
     rb_define_private_method(cDuckDBAppender, "_append_interval", appender__append_interval, 3);
     rb_define_private_method(cDuckDBAppender, "_append_time", appender__append_time, 4);

data/ext/duckdb/extracted_statements.c

@@ -81,7 +81,6 @@ static VALUE duckdb_extracted_statements_size(VALUE self) {
     return ULL2NUM(ctx->num_statements);
 }
 
-
 static VALUE duckdb_extracted_statements_prepared_statement(VALUE self, VALUE con, VALUE index) {
     rubyDuckDBConnection *pcon;
     rubyDuckDBExtractedStatements *ctx;

data/ext/duckdb/prepared_statement.c

@@ -72,7 +72,8 @@ VALUE rbduckdb_prepared_statement_new(duckdb_connection con, duckdb_extracted_st
     TypedData_Get_Struct(obj, rubyDuckDBPreparedStatement, &prepared_statement_data_type, ctx);
 
     if (duckdb_prepare_extracted_statement(con, extracted_statements, index, &(ctx->prepared_statement)) == DuckDBError) {
-        rb_raise(eDuckDBError, "Failed to create DuckDB::PreparedStatement object.");
+        const char *error = duckdb_prepare_error(ctx->prepared_statement);
+        rb_raise(eDuckDBError, "%s", error ? error : "Failed to create DuckDB::PreparedStatement object.");
     }
     return obj;
 }
@@ -90,7 +91,7 @@ static VALUE duckdb_prepared_statement_initialize(VALUE self, VALUE con, VALUE q
 
     if (duckdb_prepare(ctxcon->con, StringValuePtr(query), &(ctx->prepared_statement)) == DuckDBError) {
         const char *error = duckdb_prepare_error(ctx->prepared_statement);
-        rb_raise(eDuckDBError, "%s", error);
+        rb_raise(eDuckDBError, "%s", error ? error : "Failed to prepare statement(Database connection closed?).");
     }
     return self;
 }

data/lib/duckdb/connection.rb

@@ -8,7 +8,6 @@ module DuckDB
   #   con = db.connect
   #   con.query(sql)
   class Connection
-    #
     # executes sql with args.
     # The first argument sql must be SQL string.
     # The rest arguments are parameters of SQL string.
@@ -24,7 +23,6 @@ module DuckDB
     #
     #   sql = 'SELECT * FROM users WHERE name = $name AND email = $email'
     #   dave = con.query(sql, name: 'Dave', email: 'dave@example.com')
-    #
     def query(sql, *args, **kwargs)
       return query_multi_sql(sql) if args.empty? && kwargs.empty?
 
@@ -39,13 +37,13 @@ module DuckDB
       result = nil
       stmts.each do |stmt|
         result = stmt.execute
+        stmt.destroy
       end
       result
     ensure
       stmts&.destroy
     end
 
-    #
     # executes sql with args asynchronously.
     # The first argument sql must be SQL string.
     # The rest arguments are parameters of SQL string.
@@ -60,7 +58,6 @@ module DuckDB
     #   pending_result.execute_task while pending_result.state == :not_ready
     #   result = pending_result.execute_pending
     #   result.each.first
-    #
     def async_query(sql, *args, **kwargs)
       prepare(sql) do |stmt|
         stmt.bind_args(*args, **kwargs)
@@ -68,7 +65,6 @@ module DuckDB
       end
     end
 
-    #
     # executes sql with args asynchronously and provides streaming result.
     # The first argument sql must be SQL string.
     # The rest arguments are parameters of SQL string.
@@ -84,7 +80,6 @@ module DuckDB
     #   pending_result.execute_task while pending_result.state == :not_ready
     #   result = pending_result.execute_pending
     #   result.each.first
-    #
     def async_query_stream(sql, *args, **kwargs)
       prepare(sql) do |stmt|
         stmt.bind_args(*args, **kwargs)
@@ -92,10 +87,8 @@ module DuckDB
       end
     end
 
-    #
     # connects DuckDB database
     # The first argument is DuckDB::Database object
-    #
     def connect(db)
       conn = _connect(db)
       return conn unless block_given?
@@ -107,7 +100,6 @@ module DuckDB
       end
     end
 
-    #
     # returns PreparedStatement object.
     # The first argument is SQL string.
     # If block is given, the block is executed with PreparedStatement object
@@ -127,17 +119,14 @@ module DuckDB
     #              stmt.bind_args(name: 'Dave', email: 'dave@example.com')
     #              stmt.execute
     #            end
-    #
     def prepared_statement(str, &)
       return PreparedStatement.new(self, str) unless block_given?
 
       PreparedStatement.prepare(self, str, &)
     end
 
-    #
     # returns Appender object.
     # The first argument is table name
-    #
     def appender(table)
       appender = create_appender(table)
 

data/lib/duckdb/converter.rb

@@ -155,6 +155,19 @@ module DuckDB
       end
     end
 
+    def _parse_deciaml(value)
+      case value
+      when BigDecimal
+        value
+      else
+        begin
+          BigDecimal(value.to_s)
+        rescue StandardError => e
+          raise(ArgumentError, "Cannot parse `#{value.inspect}` to BigDecimal object. #{e.message}")
+        end
+      end
+    end
+
     def _to_query_progress(percentage, rows_processed, total_rows_to_process)
       DuckDB::QueryProgress.new(percentage, rows_processed, total_rows_to_process).freeze
     end
@@ -171,5 +184,12 @@ module DuckDB
         raise(ArgumentError, "The argument `#{value.inspect}` must be Integer.")
       end
     end
+
+    def decimal_to_hugeint(value)
+      integer_value = (value * (10 ** value.scale)).to_i
+      integer_to_hugeint(integer_value)
+    rescue FloatDomainError => e
+      raise(ArgumentError, "The argument `#{value.inspect}` must be converted to Integer. #{e.message}")
+    end
   end
 end

data/lib/duckdb/database.rb

@@ -20,13 +20,11 @@ module DuckDB
   #   result.each do |row|
   #     p row
   #   end
-  #
   class Database
     private_class_method :_open
     private_class_method :_open_ext
 
     class << self
-      ##
       # Opens database.
       # The first argument is DuckDB database file path to open.
       # If there is no argument, the method opens DuckDB database in memory.
@@ -40,7 +38,6 @@ module DuckDB
       #     con = db.connect
       #     con.query('CREATE TABLE users (id INTEGER, name VARCHAR(30))')
       #   end
-      #
       def open(dbpath = nil, config = nil)
         db = _db_open(dbpath, config)
         return db unless block_given?
@@ -54,7 +51,7 @@ module DuckDB
 
       private
 
-      def _db_open(dbpath, config)
+      def _db_open(dbpath, config) # :nodoc:
         if config
           _open_ext(dbpath, config)
         else
@@ -63,7 +60,6 @@ module DuckDB
       end
     end
 
-    ##
     # connects database.
     #
     # The method yields block and disconnects the database if block given
@@ -75,7 +71,6 @@ module DuckDB
     #   db.connect do |con|
     #     con.query('CREATE TABLE users (id INTEGER, name VARCHAR(30))')
     #   end
-    #
     def connect
       conn = _connect
       return conn unless block_given?

data/lib/duckdb/library_version.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 module DuckDB
+  # represents the version of the DuckDB library.
+  # If DuckDB.library_version is v0.2.0, then DuckDB::LIBRARY_VERSION is 0.2.0.
   LIBRARY_VERSION = library_version[1..]
 end

data/lib/duckdb/prepared_statement.rb

@@ -216,6 +216,25 @@ module DuckDB
       _bind_interval(index, value.interval_months, value.interval_days, value.interval_micros)
     end
 
+    # binds i-th parameter with SQL prepared statement.
+    # The first argument is index of parameter.
+    # The index of first parameter is 1 not 0.
+    # The second argument value is to expected BigDecimal value or any value
+    # that can be parsed into a BigDecimal.
+    #
+    #   require 'duckdb'
+    #   db = DuckDB::Database.open('duckdb_database')
+    #   con = db.connect
+    #   sql ='SELECT value FROM decimals WHERE decimal = ?'
+    #   stmt = PreparedStatement.new(con, sql)
+    #   stmt.bind_decimal(1, BigDecimal('987654.321'))
+    def bind_decimal(index, value)
+      decimal = _parse_deciaml(value)
+      lower, upper = decimal_to_hugeint(decimal)
+      width = decimal.to_s('F').gsub(/[^0-9]/, '').length
+      _bind_decimal(index, lower, upper, width, decimal.scale)
+    end
+
     # binds i-th parameter with SQL prepared statement.
     # The first argument is index of parameter.
     # The index of first parameter is 1 not 0.
@@ -264,7 +283,7 @@ module DuckDB
       when Date
         bind_varchar(index, value.strftime('%Y-%m-%d'))
       when BigDecimal
-        bind_varchar(index, value.to_s('F'))
+        bind_decimal(index, value)
       else
         raise(DuckDB::Error, "not supported type `#{value}` (#{value.class})")
       end

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.2.1'
+  VERSION = '1.1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 1.1.2.1
+  version: 1.1.3.1
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-04 00:00:00.000000000 Z
+date: 2024-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: This module is Ruby binding for DuckDB database engine.