duckdb 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74313dca99b11539431ecfe95cdd3f6392e0993776f292487991cf02e654f78f
-  data.tar.gz: 151e355bd98be14256b1e78e02eeb7c60dff12e1f2a7ef875e3e9604b7bfb2b3
+  metadata.gz: 0a27e917703a870dba56470e00cb4ae70f5b62dcb256d39da63cc88a0a888b5e
+  data.tar.gz: 8dc0b2f58cc6345540d62cdee126951de02e83b61d555da747ebc7f9a3d486a8
 SHA512:
-  metadata.gz: 6da56e491796d920c3c330d5dd2941b6b23f119ebb0bfed4f8e5ae25e2d2f1a83445cd06cd9d0dfab55a19184b9ed6302f04d2f61c038c8352fec8c0ebc60372
-  data.tar.gz: 8e6f30d324473da40e4e65c7ec8d6a96625eefa835647d8412cc8a8755b5cc29246100ddb2f48f42cc60f006927af4d8b1373b2c1c3e2e6c98f2f891d83fa8e4
+  metadata.gz: 45ee35ed43062e134e6c672f16ad92c99a7552607ed221795be8a22bc1b0b33b58b946e323cffc07fb032ad00833f1ec6b667fdceac537cf2dd1968663c44dd7
+  data.tar.gz: b57c3c55f4cda72fddf72909b16182448b5466c0d14b59afc2776f312c8640af6353786e862a086d782fe9f6f4670fd7d8f6d03fe6f8be47464b3aadcf039d7c

data/.github/workflows/test_by_github.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['2.5.x', '2.6.x']
-        duckdb: ['0.1.2', '0.1.3']
+        duckdb: ['0.1.5']
 
     steps:
     - uses: actions/checkout@v1
@@ -19,43 +19,24 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
 
-    - name: duckdb 0.1.2 cache
-      id: duckdb-cache-v0_1_2
+    - name: duckdb 0.1.5 cache
+      id: duckdb-cache-v0_1_5
       uses: actions/cache@v1.1.0
       with:
-        path: duckdb-v0.1.2
-        key: ${{ runner.os }}-duckdb-v0_1_2_007
+        path: duckdb-v0.1.5
+        key: ${{ runner.os }}-duckdb-v0_1_5_001
         restore-keys: |
-          ${{ runner.os }}-duckdb-v0_1_2
+          ${{ runner.os }}-duckdb-v0_1_5
 
-    - name: Build duckdb 0.1.2
-      if: steps.duckdb-cache-v0_1_2.outputs.cache-hit != 'true'
+    - name: Build duckdb 0.1.5
+      if: steps.duckdb-cache-v0_1_5.outputs.cache-hit != 'true'
       run: |
-        git clone -b v0.1.2 https://github.com/cwida/duckdb.git duckdb-tmp-v0.1.2
-        cd duckdb-tmp-v0.1.2 && make && cd ..
-        rm -rf duckdb-v0.1.2
-        mkdir -p duckdb-v0.1.2/build/release/src duckdb-v0.1.2/src
-        cp -rip duckdb-tmp-v0.1.2/build/release/src/*.so duckdb-v0.1.2/build/release/src
-        cp -rip duckdb-tmp-v0.1.2/src/include duckdb-v0.1.2/src/
-
-    - name: duckdb 0.1.3 cache
-      id: duckdb-cache-v0_1_3
-      uses: actions/cache@v1.1.0
-      with:
-        path: duckdb-v0.1.3
-        key: ${{ runner.os }}-duckdb-v0_1_3_001
-        restore-keys: |
-          ${{ runner.os }}-duckdb-v0_1_3
-
-    - name: Build duckdb 0.1.3
-      if: steps.duckdb-cache-v0_1_3.outputs.cache-hit != 'true'
-      run: |
-        git clone -b v0.1.3 https://github.com/cwida/duckdb.git duckdb-tmp-v0.1.3
-        cd duckdb-tmp-v0.1.3 && make && cd ..
-        rm -rf duckdb-v0.1.3
-        mkdir -p duckdb-v0.1.3/build/release/src duckdb-v0.1.3/src
-        cp -rip duckdb-tmp-v0.1.3/build/release/src/*.so duckdb-v0.1.3/build/release/src
-        cp -rip duckdb-tmp-v0.1.3/src/include duckdb-v0.1.3/src/
+        git clone -b v0.1.5 https://github.com/cwida/duckdb.git duckdb-tmp-v0.1.5
+        cd duckdb-tmp-v0.1.5 && make && cd ..
+        rm -rf duckdb-v0.1.5
+        mkdir -p duckdb-v0.1.5/build/release/src duckdb-v0.1.5/src
+        cp -rip duckdb-tmp-v0.1.5/build/release/src/*.so duckdb-v0.1.5/build/release/src
+        cp -rip duckdb-tmp-v0.1.5/src/include duckdb-v0.1.5/src/
 
     - name: Build and test with Rake with Ruby ${{ matrix.ruby }}
       env:

data/.travis.yml

@@ -2,16 +2,13 @@ language: ruby
 cache:
   bundler: true
   directories:
-    - ${HOME}/duckdb-v0.1.2
-    - ${HOME}/duckdb-v0.1.3
+    - ${HOME}/duckdb-v0.1.5
 before_install:
   - yes | gem update --system
-  - if [[ ! -d ${HOME}/duckdb-v0.1.2/build ]]; then cd ${HOME} && git clone -b v0.1.2 https://github.com/cwida/duckdb.git duckdb-v0.1.2 && cd duckdb-v0.1.2 && make && cd ${TRAVIS_BUILD_DIR}; fi
-  - if [[ ! -d ${HOME}/duckdb-v0.1.3/build ]]; then cd ${HOME} && git clone -b v0.1.3 https://github.com/cwida/duckdb.git duckdb-v0.1.3 && cd duckdb-v0.1.3 && make && cd ${TRAVIS_BUILD_DIR}; fi
+  - if [[ ! -d ${HOME}/duckdb-v0.1.5/build ]]; then cd ${HOME} && git clone -b v0.1.5 https://github.com/cwida/duckdb.git duckdb-v0.1.5 && cd duckdb-v0.1.5 && make && cd ${TRAVIS_BUILD_DIR}; fi
 
 env:
-  - DUCKDB_VERSION=0.1.2
-  - DUCKDB_VERSION=0.1.3
+  - DUCKDB_VERSION=0.1.5
 rvm:
   - 2.5.7
   - 2.6.5

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # ChangeLog
 
+## 0.0.7
+
+- bump DuckDB to v0.1.5
+  - DuckDB version must be 0.1.5 or later.
+- add DuckDB::Connection#connect, alias method open
+- add DuckDB::Connection#disconnect, alias method close
+- add DuckDB::Database#close
+
 ## 0.0.6
 
 - add alias `execute` of `DuckDB::Connection#query`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    duckdb (0.0.6)
+    duckdb (0.0.7)
 
 GEM
   remote: https://rubygems.org/

data/ext/duckdb/connection.c

@@ -33,6 +33,34 @@ VALUE create_connection(VALUE oDuckDBDatabase)
     return obj;
 }
 
+static VALUE duckdb_connection_disconnect(VALUE self)
+{
+    rubyDuckDBConnection *ctx;
+
+    Data_Get_Struct(self, rubyDuckDBConnection, ctx);
+    duckdb_disconnect(&(ctx->con));
+
+    return self;
+}
+
+static VALUE duckdb_connection_connect(VALUE self, VALUE oDuckDBDatabase)
+{
+    rubyDuckDBConnection *ctx;
+    rubyDuckDB *ctxdb;
+
+    if (!rb_obj_is_kind_of(oDuckDBDatabase, cDuckDBDatabase)) {
+        rb_raise(rb_eTypeError, "The first argument must be DuckDB::Database object.");
+    }
+    Data_Get_Struct(oDuckDBDatabase, rubyDuckDB, ctxdb);
+    Data_Get_Struct(self, rubyDuckDBConnection, ctx);
+
+    if (duckdb_connect(ctxdb->db, &(ctx->con)) == DuckDBError) {
+        rb_raise(eDuckDBError, "connection error");
+    }
+
+    return self;
+}
+
 static VALUE duckdb_connection_query_sql(VALUE self, VALUE str)
 {
     rubyDuckDBConnection *ctx;
@@ -43,6 +71,10 @@ static VALUE duckdb_connection_query_sql(VALUE self, VALUE str)
     Data_Get_Struct(self, rubyDuckDBConnection, ctx);
     Data_Get_Struct(result, rubyDuckDBResult, ctxr);
 
+    if (!(ctx->con)) {
+        rb_raise(eDuckDBError, "Database connection closed");
+    }
+
     if (duckdb_query(ctx->con, StringValueCStr(str), &(ctxr->result)) == DuckDBError) {
         rb_raise(eDuckDBError, "%s", ctxr->result.error_message);
     }
@@ -54,5 +86,7 @@ void init_duckdb_connection(void)
     cDuckDBConnection = rb_define_class_under(mDuckDB, "Connection", rb_cObject);
     rb_define_alloc_func(cDuckDBConnection, allocate);
 
+    rb_define_method(cDuckDBConnection, "disconnect", duckdb_connection_disconnect, 0);
+    rb_define_method(cDuckDBConnection, "connect", duckdb_connection_connect, 1);
     rb_define_private_method(cDuckDBConnection, "query_sql", duckdb_connection_query_sql, 1);
 }

data/ext/duckdb/database.c

@@ -1,10 +1,15 @@
 #include "ruby-duckdb.h"
 
+static void close_database(rubyDuckDB *p)
+{
+    duckdb_close(&(p->db));
+}
+
 static void deallocate(void * ctx)
 {
     rubyDuckDB *p = (rubyDuckDB *)ctx;
 
-    duckdb_close(&(p->db));
+    close_database(p);
     xfree(p);
 }
 
@@ -41,10 +46,25 @@ static VALUE duckdb_database_connect(VALUE self)
     return create_connection(self);
 }
 
+/*
+ *  call-seq:
+ *    duckdb.close -> DuckDB::Database
+ *
+ *  closes DuckDB database.
+ */
+static VALUE duckdb_database_close(VALUE self)
+{
+    rubyDuckDB *ctx;
+    Data_Get_Struct(self, rubyDuckDB, ctx);
+    close_database(ctx);
+    return self;
+}
+
 void init_duckdb_database(void)
 {
-    VALUE cDuckDBDatabase = rb_define_class_under(mDuckDB, "Database", rb_cObject);
+    cDuckDBDatabase = rb_define_class_under(mDuckDB, "Database", rb_cObject);
     rb_define_alloc_func(cDuckDBDatabase, allocate);
     rb_define_singleton_method(cDuckDBDatabase, "open", duckdb_database_s_open, -1);
     rb_define_method(cDuckDBDatabase, "connect", duckdb_database_connect, 0);
+    rb_define_method(cDuckDBDatabase, "close", duckdb_database_close, 0);
 }

data/ext/duckdb/database.h

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

data/ext/duckdb/extconf.rb

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

data/ext/duckdb/prepared_statement.c

@@ -61,9 +61,9 @@ static VALUE duckdb_prepared_statement_execute(VALUE self)
     return result;
 }
 
-static index_t check_index(VALUE vidx)
+static idx_t check_index(VALUE vidx)
 {
-    index_t idx = FIX2INT(vidx);
+    idx_t idx = FIX2INT(vidx);
     if (idx <= 0) {
         rb_raise(rb_eArgError, "index of parameter must be greater than 0");
     }
@@ -73,7 +73,7 @@ static index_t check_index(VALUE vidx)
 static VALUE duckdb_prepared_statement_bind_boolean(VALUE self, VALUE vidx, VALUE val)
 {
     rubyDuckDBPreparedStatement *ctx;
-    index_t idx = check_index(vidx);
+    idx_t idx = check_index(vidx);
 
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
     if (val != Qtrue && val != Qfalse) {
@@ -89,7 +89,7 @@ static VALUE duckdb_prepared_statement_bind_boolean(VALUE self, VALUE vidx, VALU
 static VALUE duckdb_prepared_statement_bind_int16(VALUE self, VALUE vidx, VALUE val)
 {
     rubyDuckDBPreparedStatement *ctx;
-    index_t idx = check_index(vidx);
+    idx_t idx = check_index(vidx);
     int16_t i16val = NUM2INT(val);
 
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
@@ -103,7 +103,7 @@ static VALUE duckdb_prepared_statement_bind_int16(VALUE self, VALUE vidx, VALUE
 static VALUE duckdb_prepared_statement_bind_int32(VALUE self, VALUE vidx, VALUE val)
 {
     rubyDuckDBPreparedStatement *ctx;
-    index_t idx = check_index(vidx);
+    idx_t idx = check_index(vidx);
     int32_t i32val = NUM2LONG(val);
 
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
@@ -117,7 +117,7 @@ static VALUE duckdb_prepared_statement_bind_int32(VALUE self, VALUE vidx, VALUE
 static VALUE duckdb_prepared_statement_bind_int64(VALUE self, VALUE vidx, VALUE val)
 {
     rubyDuckDBPreparedStatement *ctx;
-    index_t idx = check_index(vidx);
+    idx_t idx = check_index(vidx);
     int64_t i64val = NUM2LL(val);
 
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
@@ -131,7 +131,7 @@ static VALUE duckdb_prepared_statement_bind_int64(VALUE self, VALUE vidx, VALUE
 static VALUE duckdb_prepared_statement_bind_float(VALUE self, VALUE vidx, VALUE val)
 {
     rubyDuckDBPreparedStatement *ctx;
-    index_t idx = check_index(vidx);
+    idx_t idx = check_index(vidx);
     double dbl = NUM2DBL(val);
 
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
@@ -145,7 +145,7 @@ static VALUE duckdb_prepared_statement_bind_float(VALUE self, VALUE vidx, VALUE
 static VALUE duckdb_prepared_statement_bind_double(VALUE self, VALUE vidx, VALUE val)
 {
     rubyDuckDBPreparedStatement *ctx;
-    index_t idx = check_index(vidx);
+    idx_t idx = check_index(vidx);
     double dbl = NUM2DBL(val);
 
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
@@ -159,7 +159,7 @@ static VALUE duckdb_prepared_statement_bind_double(VALUE self, VALUE vidx, VALUE
 static VALUE duckdb_prepared_statement_bind_varchar(VALUE self, VALUE vidx, VALUE str)
 {
     rubyDuckDBPreparedStatement *ctx;
-    index_t idx = check_index(vidx);
+    idx_t idx = check_index(vidx);
 
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
     if (duckdb_bind_varchar(ctx->prepared_statement, idx, StringValuePtr(str)) == DuckDBError) {
@@ -168,11 +168,10 @@ static VALUE duckdb_prepared_statement_bind_varchar(VALUE self, VALUE vidx, VALU
     return self;
 }
 
-#ifdef HAVE_DUCKDB_BIND_NULL
 static VALUE duckdb_prepared_statement_bind_null(VALUE self, VALUE vidx)
 {
     rubyDuckDBPreparedStatement *ctx;
-    index_t idx = check_index(vidx);
+    idx_t idx = check_index(vidx);
 
     Data_Get_Struct(self, rubyDuckDBPreparedStatement, ctx);
     if (duckdb_bind_null(ctx->prepared_statement, idx) == DuckDBError) {
@@ -180,7 +179,6 @@ static VALUE duckdb_prepared_statement_bind_null(VALUE self, VALUE vidx)
     }
     return self;
 }
-#endif
 
 void init_duckdb_prepared_statement(void)
 {
@@ -198,8 +196,5 @@ 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_BIND_NULL
-    /* duckdb version > 0.1.1 */
     rb_define_method(cDuckDBPreparedStatement, "bind_null", duckdb_prepared_statement_bind_null, 1);
-#endif
 }

data/ext/duckdb/prepared_statement.h

@@ -3,7 +3,7 @@
 
 struct _rubyDuckDBPreparedStatement {
     duckdb_prepared_statement prepared_statement;
-    index_t nparams;
+    idx_t nparams;
 };
 
 typedef struct _rubyDuckDBPreparedStatement rubyDuckDBPreparedStatement;

data/ext/duckdb/result.c

@@ -16,43 +16,43 @@ static VALUE allocate(VALUE klass)
     return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
 }
 
-static VALUE to_ruby_obj_boolean(duckdb_result *result, index_t col_idx, index_t row_idx)
+static VALUE to_ruby_obj_boolean(duckdb_result *result, idx_t col_idx, idx_t row_idx)
 {
     bool bval = duckdb_value_boolean(result, col_idx, row_idx);
     return bval ? Qtrue : Qnil;
 }
 
-static VALUE to_ruby_obj_smallint(duckdb_result *result, index_t col_idx, index_t row_idx)
+static VALUE to_ruby_obj_smallint(duckdb_result *result, idx_t col_idx, idx_t row_idx)
 {
     int16_t i16val = duckdb_value_int16(result, col_idx, row_idx);
     return INT2FIX(i16val);
 }
 
-static VALUE to_ruby_obj_integer(duckdb_result *result, index_t col_idx, index_t row_idx)
+static VALUE to_ruby_obj_integer(duckdb_result *result, idx_t col_idx, idx_t row_idx)
 {
     int32_t i32val = duckdb_value_int32(result, col_idx, row_idx);
     return INT2NUM(i32val);
 }
 
-static VALUE to_ruby_obj_bigint(duckdb_result *result, index_t col_idx, index_t row_idx)
+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);
 }
 
-static VALUE to_ruby_obj_float(duckdb_result *result, index_t col_idx, index_t row_idx)
+static VALUE to_ruby_obj_float(duckdb_result *result, idx_t col_idx, idx_t row_idx)
 {
     float fval = duckdb_value_float(result, col_idx, row_idx);
     return DBL2NUM(fval);
 }
 
-static VALUE to_ruby_obj_double(duckdb_result *result, index_t col_idx, index_t row_idx)
+static VALUE to_ruby_obj_double(duckdb_result *result, idx_t col_idx, idx_t row_idx)
 {
     double dval = duckdb_value_double(result, col_idx, row_idx);
     return DBL2NUM(dval);
 }
 
-static VALUE to_ruby_obj(duckdb_result *result, index_t col_idx, index_t row_idx)
+static VALUE to_ruby_obj(duckdb_result *result, idx_t col_idx, idx_t row_idx)
 {
     char *p;
     VALUE obj = Qnil;
@@ -80,9 +80,9 @@ static VALUE to_ruby_obj(duckdb_result *result, index_t col_idx, index_t row_idx
     return obj;
 }
 
-static VALUE row_array(rubyDuckDBResult *ctx, index_t row_idx)
+static VALUE row_array(rubyDuckDBResult *ctx, idx_t row_idx)
 {
-    index_t col_idx;
+    idx_t col_idx;
     VALUE ary = rb_ary_new2(ctx->result.column_count);
     for(col_idx = 0; col_idx < ctx->result.column_count; col_idx++) {
         rb_ary_store(ary, col_idx, to_ruby_obj(&(ctx->result), col_idx, row_idx));
@@ -101,7 +101,7 @@ static VALUE duckdb_result_row_size(VALUE oDuckDBResult, VALUE args, VALUE obj)
 static VALUE duckdb_result_each(VALUE oDuckDBResult)
 {
     rubyDuckDBResult *ctx;
-    index_t row_idx = 0;
+    idx_t row_idx = 0;
 
     RETURN_SIZED_ENUMERATOR(oDuckDBResult, 0, 0, duckdb_result_row_size);
 

data/lib/duckdb.rb

@@ -1,7 +1,7 @@
+require 'duckdb/duckdb_native'
 require 'duckdb/version'
 require 'duckdb/database'
 require 'duckdb/connection'
-require 'duckdb/duckdb_native'
 require 'duckdb/result'
 require 'duckdb/prepared_statement'
 

data/lib/duckdb/connection.rb

@@ -30,5 +30,7 @@ module DuckDB
     end
 
     alias execute query
+    alias open connect
+    alias close disconnect
   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.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler