duckdb 0.6.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9967f34d6c3a9f9d30fc9c406043230d86ffe98d0ca5cf55e74a547f6877b756
-  data.tar.gz: e28bce3d7b8410ceff6da630aaa54eab4d345bfab16748f9150dfef6e3836bfe
+  metadata.gz: 469588c48fb9f9d16254cd6f78f3fd4ceb1e6886e3fc859a507d635542ba50fa
+  data.tar.gz: 1ccee32eb696806c13da87d5c8825965575575e83c45e466712a69bfa107547e
 SHA512:
-  metadata.gz: 834d11017be58ad60d8f8d8600e22f7e97dbac4ef2789921d2da8f76487e7df3c60a7458ece7e7d5f3fb7d1aca3bcf178557968131673055c2bf2d932bc982d6
-  data.tar.gz: f63d824d611095b857310f6f2f1c432d0129be7bbc3d03cb339baf938bd00c43e7911689b988494e4613f4199abf72a1b08c022d7adac26cc29f2e13ecd49883
+  metadata.gz: ebd03d8e45cb57530924a62c94e02df312b6d93624c303a1f05fb1a886b9c92aaae208feaa4419774dc325ba4078c3d90b281819dbc695f0d5a37139c787a481
+  data.tar.gz: 6096e668ea12bd32950cea838844537ea3ed872398d944e88473f4efc9f9088320dc8f565cd62e9c48522596062a2034d3c89456afc4b2952df42d57492b0b2a

data/.github/workflows/test_on_macos.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: ['2.6.10', '2.7.7', '3.0.5', '3.1.3', '3.2.0', 'head']
-        duckdb: ['0.5.1', '0.6.1']
+        ruby: ['2.7.7', '3.0.5', '3.1.3', '3.2.1', 'head']
+        duckdb: ['0.7.1', '0.6.1']
 
     steps:
     - uses: actions/checkout@v3

data/.github/workflows/test_on_ubuntu.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.6.10', '2.7.7', '3.0.5', '3.1.3', '3.2.0', 'head']
-        duckdb: ['0.5.1', '0.6.1']
+        ruby: ['2.7.7', '3.0.5', '3.1.3', '3.2.1', 'head']
+        duckdb: ['0.7.1', '0.6.1']
 
     steps:
     - uses: actions/checkout@v3

data/.github/workflows/test_on_windows.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: ['2.6.10', '2.7.6', '3.0.4', '3.1.2', 'ucrt', 'mingw', 'head']
-        duckdb: ['0.5.1', '0.6.1']
+        ruby: ['2.7.7', '3.0.5', '3.1.3', '3.2.1', 'ucrt', 'mingw', 'mswin', 'head']
+        duckdb: ['0.7.1', '0.6.1']
 
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # ChangeLog
 
+- bump duckdb to 0.7.1
+- fix docker build error on M1 Mac
+
+# 0.7.0
+- bump duckdb to 0.7.0
+- fix have_func argument order
+- remove unused variable in test
+- add DuckDB::LIBRARY_VERSION
+- add DuckDB::Result#_to_string_internal
+- add DuckDB::Result#__to_hugeint_internal
+- add DuckDB::Result#__to_decimal_internal
+- add Ruby 3.2.1 on CI test
+- add Ruby mswin on CI test
+## Breaking Change
+- drop Ruby 2.6
+
 # 0.6.1
 - bump Ruby to 3.2.0 on CI
 - fix deprected warning (double_heap is deprecated in GC.verify_compaction_references) with Ruby 3.2.0 on CI

data/CONTRIBUTION.md

@@ -1,5 +1,33 @@
 # Contribution Guide
 
+## Environment setup
+
+### With docker
+
+1. Fork the repository and `git clone` to your local machine.
+2. Build and access to docker container
+
+```
+docker-compose build ubuntu
+docker-compose run --rm ubuntu bash
+```
+
+In case you want custom ruby or duckdb versions, use `--build-arg` options
+```
+docker-compose build ubuntu --build-arg RUBY_VERSION=3.1.3 --build-arg DUCKDB_VERSION=0.6.0
+```
+
+### Without docker
+
+1. Install [Ruby](https://www.ruby-lang.org/) into your local machine.
+2. Install [duckdb](https://duckdb.org/) into your local machine.
+3. Fork the repository and `git clone` to your local machine.
+4. Run `bundle install`
+5. Run `rake build`
+   or you might run with C duckdb header and library directories:
+   `rake build -- --with-duckdb-include=/duckdb_header_directory --with-duckdb-lib=/duckdb_library_directory`
+
+
 ## Issue
 
 If you spot a problem, [search if an issue already exists](https://github.com/suketa/ruby-duckdb/issues).
@@ -8,17 +36,10 @@ If a related issue doesn't exist, you can open a [new issue](https://github.com/
 
 ## Fix Issues or Add New Features.
 
-1. install [Ruby](https://www.ruby-lang.org/) into your local machine.
-2. install [duckdb](https://duckdb.org/) into your local machine.
-3. fork the repository and `git clone` to your local machine.
-4. run `bundle install`
-5. run `rake build`
-   or you might run with C duckdb header and library directories:
-   `rake build -- --with-duckdb-include=/duckdb_header_directory --with-duckdb-lib=/duckdb_library_directory`
-6. run `rake test`
-7. create new branch to change the code.
-8. change the code.
-9. write test.
-10. run `rake test` and confirm all tests pass.
-11. git push.
-12. create PR.
+1. Run `rake test`
+2. Create new branch to change the code.
+3. Change the code.
+4. Write test.
+5. Run `rake test` and confirm all tests pass.
+6. Git push.
+7. Create PR.

data/Dockerfile

@@ -0,0 +1,21 @@
+ARG RUBY_VERSION=3.2.1
+FROM ruby:${RUBY_VERSION}
+
+ARG DUCKDB_VERSION=0.7.1
+
+RUN apt update -qq && \
+    apt install -y build-essential curl git wget
+
+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
+
+COPY . /root/ruby-duckdb
+WORKDIR /root/ruby-duckdb
+RUN git config --global --add safe.directory /root/ruby-duckdb
+RUN bundle install
+RUN rake build

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    duckdb (0.6.1)
+    duckdb (0.7.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.16.3)
+    minitest (5.17.0)
     rake (13.0.6)
-    rake-compiler (1.2.0)
+    rake-compiler (1.2.1)
       rake
 
 PLATFORMS
@@ -21,6 +21,3 @@ DEPENDENCIES
   minitest (~> 5.0)
   rake (~> 13.0)
   rake-compiler
-
-BUNDLED WITH
-   2.3.22

data/docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3'
+services:
+  ubuntu:
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+      args:
+        - RUBY_VERSION
+        - DUCKDB_VERSION
+    working_dir: /root/ruby-duckdb
+    volumes:
+      - .:/root/ruby-duckdb

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 = '>= 2.6.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_development_dependency 'bundler', '~> 2.3'
   spec.add_development_dependency 'minitest', '~> 5.0'

data/ext/duckdb/extconf.rb

@@ -2,7 +2,7 @@ require 'mkmf'
 
 def duckdb_library_available?(func)
   header = find_header('duckdb.h') || find_header('duckdb.h', '/opt/homebrew/include')
-  library = have_func('duckdb', func) || find_library('duckdb', func, '/opt/homebrew/opt/duckdb/lib')
+  library = have_func(func, 'duckdb.h') || find_library('duckdb', func, '/opt/homebrew/opt/duckdb/lib')
   header && library
 end
 
@@ -22,13 +22,10 @@ dir_config('duckdb')
 
 check_duckdb_library('duckdb_pending_prepared', '0.5.0')
 
-# check duckdb >= 0.3.3
-# ducdb >= 0.3.3 if duckdb_append_data_chunk() is defined.
-have_func('duckdb_append_data_chunk', 'duckdb.h')
-
 # check duckdb >= 0.6.0
 have_func('duckdb_value_string', 'duckdb.h')
 
-have_func('duckdb_free', 'duckdb.h')
+# check duckdb >= 0.7.0
+have_func('duckdb_extract_statements', 'duckdb.h')
 
 create_makefile('duckdb/duckdb_native')

data/ext/duckdb/prepared_statement.c

@@ -68,7 +68,7 @@ static VALUE duckdb_prepared_statement_initialize(VALUE self, VALUE con, VALUE q
 static VALUE duckdb_prepared_statement_nparams(VALUE self) {
     rubyDuckDBPreparedStatement *ctx;
     TypedData_Get_Struct(self, rubyDuckDBPreparedStatement, &prepared_statement_data_type, ctx);
-    return rb_int2big(duckdb_nparams(ctx->prepared_statement));
+    return ULL2NUM(duckdb_nparams(ctx->prepared_statement));
 }
 
 
@@ -86,7 +86,7 @@ static VALUE duckdb_prepared_statement_execute(VALUE self) {
 }
 
 static idx_t check_index(VALUE vidx) {
-    idx_t idx = FIX2INT(vidx);
+    idx_t idx = NUM2ULL(vidx);
     if (idx <= 0) {
         rb_raise(rb_eArgError, "index of parameter must be greater than 0");
     }

data/ext/duckdb/result.c

@@ -10,6 +10,8 @@ static VALUE to_ruby_obj_smallint(duckdb_result *result, idx_t col_idx, idx_t ro
 static VALUE to_ruby_obj_utinyint(duckdb_result *result, idx_t col_idx, idx_t row_idx);
 static VALUE to_ruby_obj_integer(duckdb_result *result, idx_t col_idx, idx_t row_idx);
 static VALUE to_ruby_obj_bigint(duckdb_result *result, idx_t col_idx, idx_t row_idx);
+static VALUE to_ruby_obj_hugeint(duckdb_result *result, idx_t col_idx, idx_t row_idx);
+static VALUE to_ruby_obj_decimal(duckdb_result *result, idx_t col_idx, idx_t row_idx);
 static VALUE to_ruby_obj_float(duckdb_result *result, idx_t col_idx, idx_t row_idx);
 static VALUE to_ruby_obj_double(duckdb_result *result, idx_t col_idx, idx_t row_idx);
 static VALUE to_ruby_obj_blob(duckdb_result *result, idx_t col_idx, idx_t row_idx);
@@ -24,9 +26,12 @@ static VALUE duckdb_result__to_smallint(VALUE oDuckDBResult, VALUE row_idx, VALU
 static VALUE duckdb_result__to_utinyint(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx);
 static VALUE duckdb_result__to_integer(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx);
 static VALUE duckdb_result__to_bigint(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx);
+static VALUE duckdb_result___to_hugeint_internal(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx);
+static VALUE duckdb_result___to_decimal_internal(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx);
 static VALUE duckdb_result__to_float(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx);
 static VALUE duckdb_result__to_double(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx);
 static VALUE duckdb_result__to_string(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx);
+static VALUE duckdb_result__to_string_internal(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx);
 static VALUE duckdb_result__to_blob(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx);
 static VALUE duckdb_result__enum_internal_type(VALUE oDuckDBResult, VALUE col_idx);
 static VALUE duckdb_result__enum_dictionary_size(VALUE oDuckDBResult, VALUE col_idx);
@@ -82,7 +87,17 @@ static VALUE to_ruby_obj_integer(duckdb_result *result, idx_t col_idx, idx_t row
 
 static VALUE to_ruby_obj_bigint(duckdb_result *result, idx_t col_idx, idx_t row_idx) {
     int64_t i64val = duckdb_value_int64(result, col_idx, row_idx);
-    return rb_int2big(i64val);
+    return LL2NUM(i64val);
+}
+
+static VALUE to_ruby_obj_hugeint(duckdb_result *result, idx_t col_idx, idx_t row_idx) {
+    duckdb_hugeint hugeint = duckdb_value_hugeint(result, col_idx, row_idx);
+    return rb_ary_new3(2, ULL2NUM(hugeint.lower), LL2NUM(hugeint.upper));
+}
+
+static VALUE to_ruby_obj_decimal(duckdb_result *result, idx_t col_idx, idx_t row_idx) {
+    duckdb_decimal decimal = duckdb_value_decimal(result, col_idx, row_idx);
+    return rb_ary_new3(4, ULL2NUM(decimal.value.lower), LL2NUM(decimal.value.upper), UINT2NUM(decimal.width), UINT2NUM(decimal.scale));
 }
 
 static VALUE to_ruby_obj_float(duckdb_result *result, idx_t col_idx, idx_t row_idx) {
@@ -255,6 +270,20 @@ static VALUE duckdb_result__to_bigint(VALUE oDuckDBResult, VALUE row_idx, VALUE
     return to_ruby_obj_bigint(&(ctx->result), NUM2LL(col_idx), NUM2LL(row_idx));
 }
 
+static VALUE duckdb_result___to_hugeint_internal(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx) {
+    rubyDuckDBResult *ctx;
+    TypedData_Get_Struct(oDuckDBResult, rubyDuckDBResult, &result_data_type, ctx);
+
+    return to_ruby_obj_hugeint(&(ctx->result), NUM2LL(col_idx), NUM2LL(row_idx));
+}
+
+static VALUE duckdb_result___to_decimal_internal(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx) {
+    rubyDuckDBResult *ctx;
+    TypedData_Get_Struct(oDuckDBResult, rubyDuckDBResult, &result_data_type, ctx);
+
+    return to_ruby_obj_decimal(&(ctx->result), NUM2LL(col_idx), NUM2LL(row_idx));
+}
+
 static VALUE duckdb_result__to_float(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx) {
     rubyDuckDBResult *ctx;
     TypedData_Get_Struct(oDuckDBResult, rubyDuckDBResult, &result_data_type, ctx);
@@ -295,6 +324,30 @@ static VALUE duckdb_result__to_string(VALUE oDuckDBResult, VALUE row_idx, VALUE
     return Qnil;
 }
 
+static VALUE duckdb_result__to_string_internal(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx) {
+    rubyDuckDBResult *ctx;
+#ifdef HAVE_DUCKDB_H_GE_V060
+    duckdb_string p;
+#else
+    char *p;
+#endif
+    VALUE obj;
+    TypedData_Get_Struct(oDuckDBResult, rubyDuckDBResult, &result_data_type, ctx);
+
+#ifdef HAVE_DUCKDB_H_GE_V060
+    p = duckdb_value_string_internal(&(ctx->result), NUM2LL(col_idx), NUM2LL(row_idx));
+    if (p.data) {
+        obj = rb_utf8_str_new(p.data, p.size);
+#else
+    p = duckdb_value_varchar_internal(&(ctx->result), NUM2LL(col_idx), NUM2LL(row_idx));
+    if (p) {
+        obj = rb_utf8_str_new_cstr(p);
+#endif
+        return obj;
+    }
+    return Qnil;
+}
+
 static VALUE duckdb_result__to_blob(VALUE oDuckDBResult, VALUE row_idx, VALUE col_idx) {
     rubyDuckDBResult *ctx;
     TypedData_Get_Struct(oDuckDBResult, rubyDuckDBResult, &result_data_type, ctx);
@@ -365,9 +418,12 @@ void init_duckdb_result(void) {
     rb_define_private_method(cDuckDBResult, "_to_utinyint", duckdb_result__to_utinyint, 2);
     rb_define_private_method(cDuckDBResult, "_to_integer", duckdb_result__to_integer, 2);
     rb_define_private_method(cDuckDBResult, "_to_bigint", duckdb_result__to_bigint, 2);
+    rb_define_private_method(cDuckDBResult, "__to_hugeint_internal", duckdb_result___to_hugeint_internal, 2);
+    rb_define_private_method(cDuckDBResult, "__to_decimal_internal", duckdb_result___to_decimal_internal, 2);
     rb_define_private_method(cDuckDBResult, "_to_float", duckdb_result__to_float, 2);
     rb_define_private_method(cDuckDBResult, "_to_double", duckdb_result__to_double, 2);
     rb_define_private_method(cDuckDBResult, "_to_string", duckdb_result__to_string, 2);
+    rb_define_private_method(cDuckDBResult, "_to_string_internal", duckdb_result__to_string_internal, 2);
     rb_define_private_method(cDuckDBResult, "_to_blob", duckdb_result__to_blob, 2);
     rb_define_private_method(cDuckDBResult, "_enum_internal_type", duckdb_result__enum_internal_type, 1);
     rb_define_private_method(cDuckDBResult, "_enum_dictionary_size", duckdb_result__enum_dictionary_size, 1);

data/ext/duckdb/ruby-duckdb.h

@@ -4,14 +4,14 @@
 #include "ruby.h"
 #include <duckdb.h>
 
-#ifdef HAVE_DUCKDB_APPEND_DATA_CHUNK
-#define HAVE_DUCKDB_H_GE_V033 1
-#endif
-
 #ifdef HAVE_DUCKDB_VALUE_STRING
 #define HAVE_DUCKDB_H_GE_V060 1
 #endif
 
+#ifdef HAVE_DUCKDB_EXTRACT_STATEMENTS
+#define HAVE_DUCKDB_H_GE_V070 1
+#endif
+
 #include "./error.h"
 #include "./database.h"
 #include "./connection.h"

data/getduckdb.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+MACHINE=`uname -m`
+
+case "$MACHINE" in
+  "x86_64" ) ARC=amd64 ;;
+  "aarch64" ) ARC=aarch64 ;;
+esac
+
+wget -O duckdb.zip "https://github.com/duckdb/duckdb/releases/download/v$DUCKDB_VERSION/libduckdb-linux-$ARC.zip"

data/lib/duckdb/library_version.rb

@@ -0,0 +1,3 @@
+module DuckDB
+  LIBRARY_VERSION = library_version[1..] if defined? library_version
+end

data/lib/duckdb/version.rb

@@ -1,5 +1,5 @@
 module DuckDB
   # The version string of ruby-duckdb.
   # Currently, ruby-duckdb is NOT semantic versioning.
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.7.1'.freeze
 end

data/lib/duckdb.rb

@@ -1,4 +1,5 @@
 require 'duckdb/duckdb_native'
+require 'duckdb/library_version'
 require 'duckdb/version'
 require 'duckdb/converter'
 require 'duckdb/database'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.1
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-30 00:00:00.000000000 Z
+date: 2023-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - CONTRIBUTION.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -88,6 +89,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - duckdb.gemspec
 - ext/duckdb/appender.c
 - ext/duckdb/appender.h
@@ -112,6 +114,7 @@ files:
 - ext/duckdb/ruby-duckdb.h
 - ext/duckdb/util.c
 - ext/duckdb/util.h
+- getduckdb.sh
 - lib/duckdb.rb
 - lib/duckdb/appender.rb
 - lib/duckdb/column.rb
@@ -119,6 +122,7 @@ files:
 - lib/duckdb/connection.rb
 - lib/duckdb/converter.rb
 - lib/duckdb/database.rb
+- lib/duckdb/library_version.rb
 - lib/duckdb/prepared_statement.rb
 - lib/duckdb/result.rb
 - lib/duckdb/version.rb
@@ -137,14 +141,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: This module is Ruby binding for DuckDB database engine.