duckdb 0.0.8.1 → 0.2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dd39809d93da52d2c4e7b5a53cbe38bb9d7adafcee2653c7b2943e6d318146d
-  data.tar.gz: 75a5aa1fa09538edb95337a202bcf1f507a080936a818a0d2dbc4f10c4b5d333
+  metadata.gz: 96e1030a16d014daaab4b84c0c15cde0d023fcb0fb761bee97056127f3530533
+  data.tar.gz: 2010828495199a8959b2246c0de6262de273387daaa3b3b9a8ebbca6e2fda47c
 SHA512:
-  metadata.gz: e2c9ef02c8139441d24f81a620c6826b09f1aed6d9a712a5c4f52d01ee140effc1686c20e653235c2ab317773bda677bfb9911a398ebe54dcea11250120bffc7
-  data.tar.gz: 7580d465e0c613a2efb38b3704ecd1fb9e610eb58a92823ce1f91083235e99628969790903988c12ce24ea7733d3ea8aa1650c6525c0311705ca785eba4f07e5
+  metadata.gz: da434b1e0f179cf6392beb998be0eba637cd782a74a4ea4474752b1c900afe1cbf43a5816cb7ff37c8b6e34226a0a2bcc4e4e89e54c28697e5ec39695775f31f
+  data.tar.gz: be2f05c2b472db0e548da9acd69aebd41ff0685fdcf925970af36d489882539a88fb51c49a791edd1e4f34daf9aac16311e15ce6771e9f504b987e1d29e1aa93

data/.github/workflows/test_on_macos.yml

@@ -0,0 +1,28 @@
+name: MacOS
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        ruby: ['2.5.8', '2.6.7', '2.7.3', '3.0.1', 'head']
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+
+    - name: Install latest duckdb by brew
+      run: |
+        brew install duckdb
+
+    - name: Build and test with Rake with Ruby ${{ matrix.ruby }}
+      run: |
+        ruby -v
+        bundle install --jobs 4 --retry 3
+        bundle exec rake

data/.github/workflows/test_on_ubuntu.yml

@@ -0,0 +1,66 @@
+name: Ubuntu
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.5.8', '2.6.7', '2.7.3', '3.0.1', 'head']
+        duckdb: ['0.2.6', '0.2.5']
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+
+    - name: duckdb 0.2.6 cache
+      id: duckdb-cache-v0_2_6
+      uses: actions/cache@v1.1.0
+      with:
+        path: duckdb-v0.2.6
+        key: ${{ runner.os }}-duckdb-v0_2_6_001
+        restore-keys: |
+          ${{ runner.os }}-duckdb-v0_2_6
+
+    - name: duckdb 0.2.5 cache
+      id: duckdb-cache-v0_2_5
+      uses: actions/cache@v1.1.0
+      with:
+        path: duckdb-v0.2.5
+        key: ${{ runner.os }}-duckdb-v0_2_5_001
+        restore-keys: |
+          ${{ runner.os }}-duckdb-v0_2_5
+
+    - name: Build duckdb 0.2.6
+      if: steps.duckdb-cache-v0_2_6.outputs.cache-hit != 'true'
+      run: |
+        git clone -b v0.2.6 https://github.com/cwida/duckdb.git duckdb-tmp-v0.2.6
+        cd duckdb-tmp-v0.2.6 && make && cd ..
+        rm -rf duckdb-v0.2.6
+        mkdir -p duckdb-v0.2.6/build/release/src duckdb-v0.2.6/src
+        cp -rip duckdb-tmp-v0.2.6/build/release/src/*.so duckdb-v0.2.6/build/release/src
+        cp -rip duckdb-tmp-v0.2.6/src/include duckdb-v0.2.6/src/
+
+    - name: Build duckdb 0.2.5
+      if: steps.duckdb-cache-v0_2_5.outputs.cache-hit != 'true'
+      run: |
+        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:
+        DUCKDB_VERSION: ${{ matrix.duckdb }}
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake -- --with-duckdb-include=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/src/include --with-duckdb-lib=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/build/release/src/

data/.travis.yml

@@ -2,17 +2,17 @@ language: ruby
 cache:
   bundler: true
   directories:
-    - ${HOME}/duckdb-v0.1.9
+    - ${HOME}/duckdb-v0.2.6
 before_install:
   - yes | gem update --system
-  - if [[ ! -d ${HOME}/duckdb-v0.1.9/build ]]; then cd ${HOME} && git clone -b v0.1.9 https://github.com/cwida/duckdb.git duckdb-v0.1.9 && cd duckdb-v0.1.9 && make && cd ${TRAVIS_BUILD_DIR}; fi
+  - if [[ ! -d ${HOME}/duckdb-v0.2.6/build ]]; then cd ${HOME} && git clone -b v0.2.6 https://github.com/cwida/duckdb.git duckdb-v0.2.6 && cd duckdb-v0.2.6 && make && cd ${TRAVIS_BUILD_DIR}; fi
 
 env:
-  - DUCKDB_VERSION=0.1.9
+  - DUCKDB_VERSION=0.2.6
 rvm:
   - 2.5.8
-  - 2.6.6
-  - 2.7.0
-  - 2.7.1
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1
   - ruby-head
 script: bundle exec rake -- --with-duckdb-include=${HOME}/duckdb-v${DUCKDB_VERSION}/src/include --with-duckdb-lib=${HOME}/duckdb-v${DUCKDB_VERSION}/build/release/src/

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # ChangeLog
 
+# 0.2.6.0
+
+- change version policy
+  - ruby-duckdb W.X.Y.Z supports duckdb W.X.Y
+- add DuckDB::Appender
+- bump DuckDB to v0.2.6 in CI.
+- remove unnecessary duckdb header file from MacOS CI.
+- add DuckDB::Connection#prepared_statement.
+
+## 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.
+- bump DuckDb to v0.2.4
+- add test CI with Ruby 3.0.0
+- add test CI on MacOS.
+- bunp DuckDB to v0.2.3
+
+## 0.0.10
+
+- bump DuckDB to v0.2.2
+- fix to build failure on MacOS.
+
+## 0.0.9
+
+- bump DuckDB to v0.2.1
+- bump Ruby to v2.7.2
+- bunmp DuckDB to v0.2.0
+
 ## 0.0.8.1
 
 - update Gemfile.lock

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    duckdb (0.0.8.1)
+    duckdb (0.2.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.13.0)
-    rake (13.0.1)
-    rake-compiler (1.1.0)
+    minitest (5.14.4)
+    rake (13.0.3)
+    rake-compiler (1.1.1)
       rake
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler (~> 2.0)
@@ -22,4 +22,4 @@ DEPENDENCIES
   rake-compiler
 
 BUNDLED WITH
-   2.1.4
+   2.2.17

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.com/suketa/ruby-duckdb.svg?branch=master)](https://travis-ci.com/suketa/ruby-duckdb)
 [![](https://github.com/suketa/ruby-duckdb/workflows/Ubuntu/badge.svg)](https://github.com/suketa/ruby-duckdb/actions?query=workflow%3AUbuntu)
+[![](https://github.com/suketa/ruby-duckdb/workflows/MacOS/badge.svg)](https://github.com/suketa/ruby-duckdb/actions?query=workflow%3AMacOS)
 
 ## Description
 
@@ -63,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/appender.c

@@ -0,0 +1,315 @@
+#include "ruby-duckdb.h"
+
+#ifdef HAVE_DUCKDB_APPENDER_CREATE
+
+static VALUE cDuckDBAppender;
+
+static void deallocate(void *);
+static VALUE allocate(VALUE klass);
+static VALUE appender_initialize(VALUE klass, VALUE con, VALUE schema, VALUE table);
+static VALUE appender_begin_row(VALUE self);
+static VALUE appender_end_row(VALUE self);
+static VALUE appender_append_bool(VALUE self, VALUE val);
+static VALUE appender_append_int8(VALUE self, VALUE val);
+static VALUE appender_append_int16(VALUE self, VALUE val);
+static VALUE appender_append_int32(VALUE self, VALUE val);
+static VALUE appender_append_int64(VALUE self, VALUE val);
+static VALUE appender_append_uint8(VALUE self, VALUE val);
+static VALUE appender_append_uint16(VALUE self, VALUE val);
+static VALUE appender_append_uint32(VALUE self, VALUE val);
+static VALUE appender_append_uint64(VALUE self, VALUE val);
+static VALUE appender_append_float(VALUE self, VALUE val);
+static VALUE appender_append_double(VALUE self, VALUE val);
+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);
+static VALUE appender_flush(VALUE self);
+static VALUE appender_close(VALUE self);
+
+static void deallocate(void * ctx)
+{
+    rubyDuckDBAppender *p = (rubyDuckDBAppender *)ctx;
+
+    duckdb_appender_destroy(&(p->appender));
+    xfree(p);
+}
+
+static VALUE allocate(VALUE klass)
+{
+    rubyDuckDBAppender *ctx = xcalloc((size_t)1, sizeof(rubyDuckDBAppender));
+    return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
+}
+
+static VALUE appender_initialize(VALUE self, VALUE con, VALUE schema, VALUE table) {
+
+    rubyDuckDBConnection *ctxcon;
+    rubyDuckDBAppender *ctx;
+    char *pschema = 0;
+
+    if (!rb_obj_is_kind_of(con, cDuckDBConnection)) {
+        rb_raise(rb_eTypeError, "1st argument should be instance of DackDB::Connection");
+    }
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+    Data_Get_Struct(con, rubyDuckDBConnection, ctxcon);
+
+    if (schema != Qnil) {
+        pschema = StringValuePtr(schema);
+    }
+
+    if (duckdb_appender_create(ctxcon->con, pschema, StringValuePtr(table), &(ctx->appender)) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to create appender");
+    }
+    return self;
+}
+
+static VALUE appender_begin_row(VALUE self) {
+    rubyDuckDBAppender *ctx;
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_appender_begin_row(ctx->appender) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to flush");
+    }
+    return self;
+}
+
+static VALUE appender_end_row(VALUE self) {
+    rubyDuckDBAppender *ctx;
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_appender_end_row(ctx->appender) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to flush");
+    }
+    return self;
+}
+
+static VALUE appender_append_bool(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (val != Qtrue && val != Qfalse) {
+        rb_raise(rb_eArgError, "argument must be boolean");
+    }
+
+    if (duckdb_append_bool(ctx->appender, (val == Qtrue)) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append boolean");
+    }
+    return self;
+}
+
+static VALUE appender_append_int8(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+    int8_t i8val = (int8_t)NUM2INT(val);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_int8(ctx->appender, i8val) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_int16(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+    int16_t i16val = NUM2INT(val);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_int16(ctx->appender, i16val) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_int32(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+    int32_t i32val = (int32_t)NUM2INT(val);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_int32(ctx->appender, i32val) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_int64(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+    int64_t i64val = NUM2LL(val);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_int64(ctx->appender, i64val) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_uint8(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+    int8_t ui8val = (uint8_t)NUM2UINT(val);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_uint8(ctx->appender, ui8val) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_uint16(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+    uint16_t ui16val = (uint16_t)NUM2UINT(val);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_uint16(ctx->appender, ui16val) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_uint32(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+    uint32_t ui32val = (uint32_t)NUM2UINT(val);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_uint32(ctx->appender, ui32val) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_uint64(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+    uint64_t ui64val = (int64_t)NUM2ULL(val);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_uint64(ctx->appender, ui64val) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_float(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+    float fval = (float)NUM2DBL(val);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_float(ctx->appender, fval) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_double(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+    double dval = NUM2DBL(val);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_double(ctx->appender, dval) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_varchar(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+    char *pval = StringValuePtr(val);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_varchar(ctx->appender, pval) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_varchar_length(VALUE self, VALUE val, VALUE len) {
+    rubyDuckDBAppender *ctx;
+
+    char *pval = StringValuePtr(val);
+    idx_t length = (idx_t)NUM2ULL(len);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_varchar_length(ctx->appender, pval, length) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_blob(VALUE self, VALUE val) {
+    rubyDuckDBAppender *ctx;
+
+    char *pval = StringValuePtr(val);
+    idx_t length = (idx_t)RSTRING_LEN(val);
+
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_blob(ctx->appender, (void *)pval, length) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_append_null(VALUE self) {
+    rubyDuckDBAppender *ctx;
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_append_null(ctx->appender) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to append");
+    }
+    return self;
+}
+
+static VALUE appender_flush(VALUE self) {
+    rubyDuckDBAppender *ctx;
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_appender_flush(ctx->appender) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to flush");
+    }
+    return self;
+}
+
+static VALUE appender_close(VALUE self) {
+    rubyDuckDBAppender *ctx;
+    Data_Get_Struct(self, rubyDuckDBAppender, ctx);
+
+    if (duckdb_appender_close(ctx->appender) == DuckDBError) {
+        rb_raise(eDuckDBError, "failed to flush");
+    }
+    return self;
+}
+
+void init_duckdb_appender(void) {
+    cDuckDBAppender = rb_define_class_under(mDuckDB, "Appender", rb_cObject);
+    rb_define_alloc_func(cDuckDBAppender, allocate);
+    rb_define_method(cDuckDBAppender, "initialize", appender_initialize, 3);
+    rb_define_method(cDuckDBAppender, "begin_row", appender_begin_row, 0);
+    rb_define_method(cDuckDBAppender, "end_row", appender_end_row, 0);
+    rb_define_method(cDuckDBAppender, "append_bool", appender_append_bool, 1);
+    rb_define_method(cDuckDBAppender, "append_int8", appender_append_int8, 1);
+    rb_define_method(cDuckDBAppender, "append_int16", appender_append_int16, 1);
+    rb_define_method(cDuckDBAppender, "append_int32", appender_append_int32, 1);
+    rb_define_method(cDuckDBAppender, "append_int64", appender_append_int64, 1);
+    rb_define_method(cDuckDBAppender, "append_uint8", appender_append_uint8, 1);
+    rb_define_method(cDuckDBAppender, "append_uint16", appender_append_uint16, 1);
+    rb_define_method(cDuckDBAppender, "append_uint32", appender_append_uint32, 1);
+    rb_define_method(cDuckDBAppender, "append_uint64", appender_append_uint64, 1);
+    rb_define_method(cDuckDBAppender, "append_float", appender_append_float, 1);
+    rb_define_method(cDuckDBAppender, "append_double", appender_append_double, 1);
+    rb_define_method(cDuckDBAppender, "append_varchar", appender_append_varchar, 1);
+    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);
+    rb_define_method(cDuckDBAppender, "flush", appender_flush, 0);
+    rb_define_method(cDuckDBAppender, "close", appender_close, 0);
+}
+#endif /* HAVE_DUCKDB_APPENDER_CREATE */

data/ext/duckdb/appender.h

@@ -0,0 +1,17 @@
+#ifndef RUBY_DUCKDB_APPENDER_H
+#define RUBY_DUCKDB_APPENDER_H
+
+#ifdef HAVE_DUCKDB_APPENDER_CREATE
+
+struct _rubyDuckDBAppender {
+    duckdb_appender appender;
+};
+
+typedef struct _rubyDuckDBAppender rubyDuckDBAppender;
+
+void init_duckdb_appender(void);
+
+#endif
+
+#endif
+

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/connection.c

@@ -1,5 +1,7 @@
 #include "ruby-duckdb.h"
 
+VALUE cDuckDBConnection;
+
 static void deallocate(void *ctx)
 {
     rubyDuckDBConnection *p = (rubyDuckDBConnection *)ctx;

data/ext/duckdb/connection.h

@@ -7,8 +7,6 @@ struct _rubyDuckDBConnection {
 
 typedef struct _rubyDuckDBConnection rubyDuckDBConnection;
 
-VALUE cDuckDBConnection;
-
 void init_duckdb_connection(void);
 VALUE create_connection(VALUE oDuckDBDatabase);
 

data/ext/duckdb/database.c

@@ -1,5 +1,7 @@
 #include "ruby-duckdb.h"
 
+VALUE cDuckDBDatabase;
+
 static void close_database(rubyDuckDB *p)
 {
     duckdb_close(&(p->db));

data/ext/duckdb/database.h

@@ -7,8 +7,6 @@ struct _rubyDuckDB {
 
 typedef struct _rubyDuckDB rubyDuckDB;
 
-VALUE cDuckDBDatabase;
-
 void init_duckdb_database(void);
 
 #endif

data/ext/duckdb/duckdb.c

@@ -12,4 +12,16 @@ 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 */
+
+#ifdef HAVE_DUCKDB_APPENDER_CREATE
+
+    init_duckdb_appender();
+
+#endif /* HAVE_DUCKDB_APPENDER_CREATE */
 }

data/ext/duckdb/error.c

@@ -1,5 +1,7 @@
 #include "ruby-duckdb.h"
 
+VALUE eDuckDBError;
+
 void init_duckdb_error(void)
 {
     eDuckDBError = rb_define_class_under(mDuckDB, "Error", rb_eStandardError);

data/ext/duckdb/error.h

@@ -1,8 +1,6 @@
 #ifndef RUBY_DUCKDB_ERROR_H
 #define RUBY_DUCKDB_ERROR_H
 
-VALUE eDuckDBError;
-
 void init_duckdb_error(void);
 
 #endif

data/ext/duckdb/extconf.rb

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

data/ext/duckdb/prepared_statement.c

@@ -81,7 +81,7 @@ static VALUE duckdb_prepared_statement_bind_boolean(VALUE self, VALUE vidx, VALU
     }
 
     if (duckdb_bind_boolean(ctx->prepared_statement, idx, (val == Qtrue)) == DuckDBError) {
-        rb_raise(eDuckDBError, "fail to bind %ld parameter", idx);
+        rb_raise(eDuckDBError, "fail to bind %llu parameter", (unsigned long long)idx);
     }
     return self;
 }
@@ -95,7 +95,7 @@ static VALUE duckdb_prepared_statement_bind_int16(VALUE self, VALUE vidx, VALUE
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
 
     if (duckdb_bind_int16(ctx->prepared_statement, idx, i16val) == DuckDBError) {
-        rb_raise(eDuckDBError, "fail to bind %ld parameter", idx);
+        rb_raise(eDuckDBError, "fail to bind %llu parameter", (unsigned long long)idx);
     }
     return self;
 }
@@ -104,12 +104,12 @@ static VALUE duckdb_prepared_statement_bind_int32(VALUE self, VALUE vidx, VALUE
 {
     rubyDuckDBPreparedStatement *ctx;
     idx_t idx = check_index(vidx);
-    int32_t i32val = NUM2LONG(val);
+    int32_t i32val = NUM2INT(val);
 
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
 
     if (duckdb_bind_int32(ctx->prepared_statement, idx, i32val) == DuckDBError) {
-        rb_raise(eDuckDBError, "fail to bind %ld parameter", idx);
+        rb_raise(eDuckDBError, "fail to bind %llu parameter", (unsigned long long)idx);
     }
     return self;
 }
@@ -123,7 +123,7 @@ static VALUE duckdb_prepared_statement_bind_int64(VALUE self, VALUE vidx, VALUE
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
 
     if (duckdb_bind_int64(ctx->prepared_statement, idx, i64val) == DuckDBError) {
-        rb_raise(eDuckDBError, "fail to bind %ld parameter", idx);
+        rb_raise(eDuckDBError, "fail to bind %llu parameter", (unsigned long long)idx);
     }
     return self;
 }
@@ -137,7 +137,7 @@ static VALUE duckdb_prepared_statement_bind_float(VALUE self, VALUE vidx, VALUE
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
 
     if (duckdb_bind_float(ctx->prepared_statement, idx, (float)dbl) == DuckDBError) {
-        rb_raise(eDuckDBError, "fail to bind %ld parameter", idx);
+        rb_raise(eDuckDBError, "fail to bind %llu parameter", (unsigned long long)idx);
     }
     return self;
 }
@@ -151,7 +151,7 @@ static VALUE duckdb_prepared_statement_bind_double(VALUE self, VALUE vidx, VALUE
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
 
     if (duckdb_bind_double(ctx->prepared_statement, idx, dbl) == DuckDBError) {
-        rb_raise(eDuckDBError, "fail to bind %ld parameter", idx);
+        rb_raise(eDuckDBError, "fail to bind %llu parameter", (unsigned long long)idx);
     }
     return self;
 }
@@ -163,11 +163,25 @@ static VALUE duckdb_prepared_statement_bind_varchar(VALUE self, VALUE vidx, VALU
 
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
     if (duckdb_bind_varchar(ctx->prepared_statement, idx, StringValuePtr(str)) == DuckDBError) {
-        rb_raise(eDuckDBError, "fail to bind %ld parameter", idx);
+        rb_raise(eDuckDBError, "fail to bind %llu parameter", (unsigned long long)idx);
     }
     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;
@@ -175,7 +189,7 @@ static VALUE duckdb_prepared_statement_bind_null(VALUE self, VALUE vidx)
 
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
     if (duckdb_bind_null(ctx->prepared_statement, idx) == DuckDBError) {
-        rb_raise(eDuckDBError, "fail to bind %ld parameter", idx);
+        rb_raise(eDuckDBError, "fail to bind %llu parameter", (unsigned long long)idx);
     }
     return self;
 }
@@ -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,6 +9,28 @@
 #include "./result.h"
 #include "./prepared_statement.h"
 
+#ifdef HAVE_DUCKDB_VALUE_BLOB
+
+#include "./blob.h"
+
+#endif /* HAVE_DUCKDB_VALUE_BLOB */
+
+#ifdef HAVE_DUCKDB_APPENDER_CREATE
+
+#include "./appender.h"
+
+#endif /* HAVE_DUCKDB_APPENDER_CREATE */
+
 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/connection.rb

@@ -44,6 +44,14 @@ module DuckDB
       end
     end
 
+    #
+    # returns PreparedStatement object.
+    # The first argument is SQL string.
+    #
+    def prepared_statement(str)
+      PreparedStatement.new(self, str)
+    end
+
     alias execute query
     alias open connect
     alias close disconnect

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.8.1'.freeze
+  VERSION = '0.2.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 0.0.8.1
+  version: 0.2.6.0
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-04 00:00:00.000000000 Z
+date: 2021-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,8 @@ extensions:
 - ext/duckdb/extconf.rb
 extra_rdoc_files: []
 files:
-- ".github/workflows/test_by_github.yml"
+- ".github/workflows/test_on_macos.yml"
+- ".github/workflows/test_on_ubuntu.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -87,6 +88,10 @@ files:
 - bin/console
 - bin/setup
 - duckdb.gemspec
+- ext/duckdb/appender.c
+- ext/duckdb/appender.h
+- ext/duckdb/blob.c
+- ext/duckdb/blob.h
 - ext/duckdb/connection.c
 - ext/duckdb/connection.h
 - ext/duckdb/database.c
@@ -128,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: This module is Ruby binding for DuckDB database engine.

data/.github/workflows/test_by_github.yml

@@ -1,66 +0,0 @@
-name: Ubuntu
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: ['2.5.8', '2.6.6', '2.7.1', 'head']
-        duckdb: ['0.1.8', '0.1.9']
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-
-    - name: duckdb 0.1.8 cache
-      id: duckdb-cache-v0_1_8
-      uses: actions/cache@v1.1.0
-      with:
-        path: duckdb-v0.1.8
-        key: ${{ runner.os }}-duckdb-v0_1_8_001
-        restore-keys: |
-          ${{ runner.os }}-duckdb-v0_1_8
-
-    - name: duckdb 0.1.9 cache
-      id: duckdb-cache-v0_1_9
-      uses: actions/cache@v1.1.0
-      with:
-        path: duckdb-v0.1.9
-        key: ${{ runner.os }}-duckdb-v0_1_9_001
-        restore-keys: |
-          ${{ runner.os }}-duckdb-v0_1_9
-
-    - name: Build duckdb 0.1.8
-      if: steps.duckdb-cache-v0_1_8.outputs.cache-hit != 'true'
-      run: |
-        git clone -b v0.1.8 https://github.com/cwida/duckdb.git duckdb-tmp-v0.1.8
-        cd duckdb-tmp-v0.1.8 && make && cd ..
-        rm -rf duckdb-v0.1.8
-        mkdir -p duckdb-v0.1.8/build/release/src duckdb-v0.1.8/src
-        cp -rip duckdb-tmp-v0.1.8/build/release/src/*.so duckdb-v0.1.8/build/release/src
-        cp -rip duckdb-tmp-v0.1.8/src/include duckdb-v0.1.8/src/
-
-    - name: Build duckdb 0.1.9
-      if: steps.duckdb-cache-v0_1_9.outputs.cache-hit != 'true'
-      run: |
-        git clone -b v0.1.9 https://github.com/cwida/duckdb.git duckdb-tmp-v0.1.9
-        cd duckdb-tmp-v0.1.9 && make && cd ..
-        rm -rf duckdb-v0.1.9
-        mkdir -p duckdb-v0.1.9/build/release/src duckdb-v0.1.9/src
-        cp -rip duckdb-tmp-v0.1.9/build/release/src/*.so duckdb-v0.1.9/build/release/src
-        cp -rip duckdb-tmp-v0.1.9/src/include duckdb-v0.1.9/src/
-
-    - name: Build and test with Rake with Ruby ${{ matrix.ruby }}
-      env:
-        DUCKDB_VERSION: ${{ matrix.duckdb }}
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
-        bundle exec rake -- --with-duckdb-include=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/src/include --with-duckdb-lib=${GITHUB_WORKSPACE}/duckdb-v${DUCKDB_VERSION}/build/release/src/