duckdb 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 165ee505735c050cb91285841186a9385d46ec4c674183fa31503753a3eb3a79
-  data.tar.gz: bca9cdb4ecf241dbe581ad0e2a5b3b600d25a75840bef6bdfed744566cfea621
+  metadata.gz: 1a0f6c8a46cecbe281cf970b5e8c6fd11c2903a5ddd58bf683341bcb299d7a36
+  data.tar.gz: 6ba452c2aa37f77c68905413e3bb6cb27697f8db23bfeca1e8ca1886ce6fb1ab
 SHA512:
-  metadata.gz: 81ea7c4bf67e976715f0ccbddb10992cd10ec228e20787c0403dbee799f2db3b37c72103e31352e7931a32df6e8c9ef2e26281c1812d96339c98be312d50b865
-  data.tar.gz: 2e788022c4977e9ac31c63bce5a1d5251b5866536d959316f228a0e46688426829a4b754305d3681973d6efecd8fdcb24a4f1c8c494d5128481410adf5bfdd49
+  metadata.gz: beb0db8d6e590ee4014aa4fb1e09a7093d6b13cebe3ad38f90cf6f29707b5e768696732f33c5d53027032ba7eacc8bf8ddecb9b112a042f05b17bbb98e086197
+  data.tar.gz: 228651ac8ed6c13044cbf0e3709444464ff552b0b431b051446def7dce074b38ef8a242f72e75c8c1ba788ae13dfc88a2041f7f2e9e70b64fb3c34c9c2c8ad85

data/.github/workflows/test_on_ubuntu.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['2.5.8', '2.6.6', '2.7.2', '3.0.0', 'head']
-        duckdb: ['0.2.4', '0.2.3']
+        duckdb: ['0.2.4', '0.2.5']
 
     steps:
     - uses: actions/checkout@v2
@@ -28,14 +28,14 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-duckdb-v0_2_4
 
-    - name: duckdb 0.2.3 cache
-      id: duckdb-cache-v0_2_3
+    - name: duckdb 0.2.5 cache
+      id: duckdb-cache-v0_2_5
       uses: actions/cache@v1.1.0
       with:
-        path: duckdb-v0.2.3
-        key: ${{ runner.os }}-duckdb-v0_2_3_001
+        path: duckdb-v0.2.5
+        key: ${{ runner.os }}-duckdb-v0_2_5_001
         restore-keys: |
-          ${{ runner.os }}-duckdb-v0_2_3
+          ${{ runner.os }}-duckdb-v0_2_5
 
     - name: Build duckdb 0.2.4
       if: steps.duckdb-cache-v0_2_4.outputs.cache-hit != 'true'
@@ -47,15 +47,15 @@ jobs:
         cp -rip duckdb-tmp-v0.2.4/build/release/src/*.so duckdb-v0.2.4/build/release/src
         cp -rip duckdb-tmp-v0.2.4/src/include duckdb-v0.2.4/src/
 
-    - name: Build duckdb 0.2.3
-      if: steps.duckdb-cache-v0_2_3.outputs.cache-hit != 'true'
+    - name: Build duckdb 0.2.5
+      if: steps.duckdb-cache-v0_2_5.outputs.cache-hit != 'true'
       run: |
-        git clone -b v0.2.3 https://github.com/cwida/duckdb.git duckdb-tmp-v0.2.3
-        cd duckdb-tmp-v0.2.3 && make && cd ..
-        rm -rf duckdb-v0.2.3
-        mkdir -p duckdb-v0.2.3/build/release/src duckdb-v0.2.3/src
-        cp -rip duckdb-tmp-v0.2.3/build/release/src/*.so duckdb-v0.2.3/build/release/src
-        cp -rip duckdb-tmp-v0.2.3/src/include duckdb-v0.2.3/src/
+        git clone -b v0.2.5 https://github.com/cwida/duckdb.git duckdb-tmp-v0.2.5
+        cd duckdb-tmp-v0.2.5 && make && cd ..
+        rm -rf duckdb-v0.2.5
+        mkdir -p duckdb-v0.2.5/build/release/src duckdb-v0.2.5/src
+        cp -rip duckdb-tmp-v0.2.5/build/release/src/*.so duckdb-v0.2.5/build/release/src
+        cp -rip duckdb-tmp-v0.2.5/src/include duckdb-v0.2.5/src/
 
     - name: Build and test with Rake with Ruby ${{ matrix.ruby }}
       env:

data/.travis.yml

@@ -2,13 +2,13 @@ language: ruby
 cache:
   bundler: true
   directories:
-    - ${HOME}/duckdb-v0.2.3
+    - ${HOME}/duckdb-v0.2.5
 before_install:
   - yes | gem update --system
-  - if [[ ! -d ${HOME}/duckdb-v0.2.3/build ]]; then cd ${HOME} && git clone -b v0.2.3 https://github.com/cwida/duckdb.git duckdb-v0.2.3 && cd duckdb-v0.2.3 && make && cd ${TRAVIS_BUILD_DIR}; fi
+  - if [[ ! -d ${HOME}/duckdb-v0.2.5/build ]]; then cd ${HOME} && git clone -b v0.2.5 https://github.com/cwida/duckdb.git duckdb-v0.2.5 && cd duckdb-v0.2.5 && make && cd ${TRAVIS_BUILD_DIR}; fi
 
 env:
-  - DUCKDB_VERSION=0.2.3
+  - DUCKDB_VERSION=0.2.5
 rvm:
   - 2.5.8
   - 2.6.6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # ChangeLog
 
+## 0.0.12
+
+- bump DuckDB to v0.2.5
+- support BLOB type (with DuckDB version 0.2.5 or later)
+
 ## 0.0.11
 
 - fix failure in test_close in test/duckdb_test/database_test.rb because DuckDB error message was changed.

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    duckdb (0.0.11)
+    duckdb (0.0.12)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.14.3)
+    minitest (5.14.4)
     rake (13.0.3)
     rake-compiler (1.1.1)
       rake

data/README.md

@@ -64,3 +64,26 @@ DuckDB::Database.open do |db|
   end
 end
 ```
+
+### using BLOB column
+
+BLOB is available with DuckDB v0.2.5 or later.
+Use `DuckDB::Blob.new` or use sting#force_encoding(Encoding::ASCII_8BIT)
+
+```
+require 'duckdb'
+
+DuckDB::Database.open do |db|
+  db.connect do |con|
+    con.query('CREATE TABLE blob_table (binary_data BLOB)')
+    stmt = DuckDB::PreparedStatement.new(con, 'INSERT INTO blob_table VALUES ($1)')
+
+    stmt.bind(1, DuckDB::Blob.new("\0\1\2\3\4\5"))
+    # stmt.bind(1, "\0\1\2\3\4\5".force_encoding(Encoding::BINARY))
+    stmt.execute
+
+    result = con.query('SELECT binary_data FROM blob_table')
+    p result.first.first
+  end
+end
+```

data/ext/duckdb/blob.c

@@ -0,0 +1,11 @@
+#include "ruby-duckdb.h"
+
+#ifdef HAVE_DUCKDB_VALUE_BLOB
+
+VALUE cDuckDBBlob;
+
+void init_duckdb_blob(void)
+{
+    cDuckDBBlob = rb_define_class_under(mDuckDB, "Blob", rb_cString);
+}
+#endif /* HAVE_DUCKDB_VALUE_BLOB */

data/ext/duckdb/blob.h

@@ -0,0 +1,14 @@
+#ifndef RUBY_DUCKDB_BLOB_H
+#define RUBY_DUCKDB_BLOB_H
+
+/*
+ * blob is supported by duckdb v0.2.5 or later
+ */
+#ifdef HAVE_DUCKDB_VALUE_BLOB
+
+void init_duckdb_blob(void);
+
+#endif /* HAVE_DUCKDB_VALUE_BLOB */
+
+#endif
+

data/ext/duckdb/duckdb.c

@@ -12,4 +12,10 @@ Init_duckdb_native(void)
     init_duckdb_connection();
     init_duckdb_result();
     init_duckdb_prepared_statement();
+
+#ifdef HAVE_DUCKDB_VALUE_BLOB
+
+    init_duckdb_blob();
+
+#endif /* HAVE_DUCKDB_VALUE_BLOB */
 }

data/ext/duckdb/extconf.rb

@@ -2,5 +2,6 @@ require 'mkmf'
 
 dir_config('duckdb')
 if have_library('duckdb')
+  have_func('duckdb_value_blob', 'duckdb.h')
   create_makefile('duckdb/duckdb_native')
 end

data/ext/duckdb/prepared_statement.c

@@ -168,6 +168,20 @@ static VALUE duckdb_prepared_statement_bind_varchar(VALUE self, VALUE vidx, VALU
     return self;
 }
 
+#ifdef HAVE_DUCKDB_VALUE_BLOB
+static VALUE duckdb_prepared_statement_bind_blob(VALUE self, VALUE vidx, VALUE blob)
+{
+    rubyDuckDBPreparedStatement *ctx;
+    idx_t idx = check_index(vidx);
+
+    Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
+    if (duckdb_bind_blob(ctx->prepared_statement, idx, (const void *)StringValuePtr(blob), (idx_t)RSTRING_LEN(blob)) == DuckDBError) {
+        rb_raise(eDuckDBError, "fail to bind %llu parameter", (unsigned long long)idx);
+    }
+    return self;
+}
+#endif /* HAVE_DUCKDB_VALUE_BLOB */
+
 static VALUE duckdb_prepared_statement_bind_null(VALUE self, VALUE vidx)
 {
     rubyDuckDBPreparedStatement *ctx;
@@ -196,5 +210,8 @@ void init_duckdb_prepared_statement(void)
     rb_define_method(cDuckDBPreparedStatement, "bind_float", duckdb_prepared_statement_bind_float, 2);
     rb_define_method(cDuckDBPreparedStatement, "bind_double", duckdb_prepared_statement_bind_double, 2);
     rb_define_method(cDuckDBPreparedStatement, "bind_varchar", duckdb_prepared_statement_bind_varchar, 2);
+#ifdef HAVE_DUCKDB_VALUE_BLOB
+    rb_define_method(cDuckDBPreparedStatement, "bind_blob", duckdb_prepared_statement_bind_blob, 2);
+#endif /* HAVE_DUCKDB_VALUE_BLOB */
     rb_define_method(cDuckDBPreparedStatement, "bind_null", duckdb_prepared_statement_bind_null, 1);
 }

data/ext/duckdb/result.c

@@ -52,6 +52,14 @@ static VALUE to_ruby_obj_double(duckdb_result *result, idx_t col_idx, idx_t row_
     return DBL2NUM(dval);
 }
 
+#ifdef HAVE_DUCKDB_VALUE_BLOB
+static VALUE to_ruby_obj_string_from_blob(duckdb_result *result, idx_t col_idx, idx_t row_idx)
+{
+    duckdb_blob bval = duckdb_value_blob(result, col_idx, row_idx);
+    return rb_str_new(bval.data, bval.size);
+}
+#endif /* HAVE_DUCKDB_VALUE_BLOB */
+
 static VALUE to_ruby_obj(duckdb_result *result, idx_t col_idx, idx_t row_idx)
 {
     char *p;
@@ -72,6 +80,10 @@ static VALUE to_ruby_obj(duckdb_result *result, idx_t col_idx, idx_t row_idx)
         return to_ruby_obj_float(result, col_idx, row_idx);
     case DUCKDB_TYPE_DOUBLE:
         return to_ruby_obj_double(result, col_idx, row_idx);
+#ifdef HAVE_DUCKDB_VALUE_BLOB
+    case DUCKDB_TYPE_BLOB:
+        return to_ruby_obj_string_from_blob(result, col_idx, row_idx);
+#endif /* HAVE_DUCKDB_VALUE_BLOB */
     default:
         p = duckdb_value_varchar(result, col_idx, row_idx);
         obj = rb_str_new2(p);

data/ext/duckdb/ruby-duckdb.h

@@ -9,9 +9,22 @@
 #include "./result.h"
 #include "./prepared_statement.h"
 
+#ifdef HAVE_DUCKDB_VALUE_BLOB
+
+#include "./blob.h"
+
+#endif /* HAVE_DUCKDB_VALUE_BLOB */
+
 extern VALUE mDuckDB;
 extern VALUE cDuckDBDatabase;
 extern VALUE cDuckDBConnection;
+
+#ifdef HAVE_DUCKDB_VALUE_BLOB
+
+extern VALUE cDuckDBBlob;
+
+#endif /* HAVE_DUCKDB_VALUE_BLOB */
+
 extern VALUE eDuckDBError;
 
 #endif

data/lib/duckdb/prepared_statement.rb

@@ -33,7 +33,11 @@ module DuckDB
       when Integer
         bind_int64(i, value)
       when String
-        bind_varchar(i, value)
+        if defined?(DuckDB::Blob)
+          blob?(value) ? bind_blob(i, value) : bind_varchar(i, value)
+        else
+          bind_varchar(i, value)
+        end
       when TrueClass, FalseClass
         bind_boolean(i, value)
       when Time
@@ -44,5 +48,11 @@ module DuckDB
         rb_raise(DuckDB::Error, "not supported type #{value} (value.class)")
       end
     end
+
+    private
+
+    def blob?(value)
+      value.instance_of?(DuckDB::Blob) || value.encoding == Encoding::BINARY
+    end
   end
 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.0.11'.freeze
+  VERSION = '0.0.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,8 @@ files:
 - bin/console
 - bin/setup
 - duckdb.gemspec
+- ext/duckdb/blob.c
+- ext/duckdb/blob.h
 - ext/duckdb/connection.c
 - ext/duckdb/connection.h
 - ext/duckdb/database.c