duckdb 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4780513bea94513e38b460cf9580b9bad9b9128d913a46f58f2054451cf838d
-  data.tar.gz: 5cbfe5da32da9562d121d634a7a45fdc153222bb4c5b8c79a2f37dbff6f57f27
+  metadata.gz: 469588c48fb9f9d16254cd6f78f3fd4ceb1e6886e3fc859a507d635542ba50fa
+  data.tar.gz: 1ccee32eb696806c13da87d5c8825965575575e83c45e466712a69bfa107547e
 SHA512:
-  metadata.gz: 04acc6297bac9ae7d217072d1fec3b7c603f407270143d654f738462e0f540a2e8ebdb67fa4d466ff13636dab279a0d245241201c9b3f829f4e97fbf628fb086
-  data.tar.gz: aa200fce49d05edee27095771e4c7e394a7431b8b1881e58d053f46dafc628920e4924c899159619c2fd337c6607eeed55f5863ea0e119f13ec2236d72c33f6b
+  metadata.gz: ebd03d8e45cb57530924a62c94e02df312b6d93624c303a1f05fb1a886b9c92aaae208feaa4419774dc325ba4078c3d90b281819dbc695f0d5a37139c787a481
+  data.tar.gz: 6096e668ea12bd32950cea838844537ea3ed872398d944e88473f4efc9f9088320dc8f565cd62e9c48522596062a2034d3c89456afc4b2952df42d57492b0b2a

data/.github/workflows/test_on_macos.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['2.7.7', '3.0.5', '3.1.3', '3.2.1', 'head']
-        duckdb: ['0.7.0', '0.6.1']
+        duckdb: ['0.7.1', '0.6.1']
 
     steps:
     - uses: actions/checkout@v3

data/.github/workflows/test_on_ubuntu.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['2.7.7', '3.0.5', '3.1.3', '3.2.1', 'head']
-        duckdb: ['0.7.0', '0.6.1']
+        duckdb: ['0.7.1', '0.6.1']
 
     steps:
     - uses: actions/checkout@v3

data/.github/workflows/test_on_windows.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['2.7.7', '3.0.5', '3.1.3', '3.2.1', 'ucrt', 'mingw', 'mswin', 'head']
-        duckdb: ['0.7.0', '0.6.1']
+        duckdb: ['0.7.1', '0.6.1']
 
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # 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

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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    duckdb (0.7.0)
+    duckdb (0.7.1)
 
 GEM
   remote: https://rubygems.org/
@@ -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/ext/duckdb/extconf.rb

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

@@ -87,7 +87,7 @@ 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) {

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-18 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