duckdb 0.0.6 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74313dca99b11539431ecfe95cdd3f6392e0993776f292487991cf02e654f78f
-  data.tar.gz: 151e355bd98be14256b1e78e02eeb7c60dff12e1f2a7ef875e3e9604b7bfb2b3
+  metadata.gz: c714dfd673f10a53f717920a00ce3a8d1bd60bb31eaa7c3d678427216ef8446d
+  data.tar.gz: 8f8df0fa662a682fc977429c25a6ee41885ca4df603edfcc25cc46f960b1256a
 SHA512:
-  metadata.gz: 6da56e491796d920c3c330d5dd2941b6b23f119ebb0bfed4f8e5ae25e2d2f1a83445cd06cd9d0dfab55a19184b9ed6302f04d2f61c038c8352fec8c0ebc60372
-  data.tar.gz: 8e6f30d324473da40e4e65c7ec8d6a96625eefa835647d8412cc8a8755b5cc29246100ddb2f48f42cc60f006927af4d8b1373b2c1c3e2e6c98f2f891d83fa8e4
+  metadata.gz: e67c083420270093e6a026037527f5e10273404d0666b155ee0afd5c7e308ceae268c46ef1f878b9b6a656dec6b97e048488b85be53f715d9253e1806f8601a0
+  data.tar.gz: a4501b2e7dc651147564da772f60f32dafbb21ddf846680128406ad9b64dbb6874ea3b6c15cd6e5226d35745680fb7f906eca7d0c8a72bf418594c7cd2486f53

data/.github/workflows/test_by_github.yml

@@ -8,54 +8,54 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.5.x', '2.6.x']
-        duckdb: ['0.1.2', '0.1.3']
+        ruby: ['2.5.8', '2.6.6', '2.7.2', 'head']
+        duckdb: ['0.2.2', '0.2.1']
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
 
-    - name: duckdb 0.1.2 cache
-      id: duckdb-cache-v0_1_2
+    - name: duckdb 0.2.2 cache
+      id: duckdb-cache-v0_2_2
       uses: actions/cache@v1.1.0
       with:
-        path: duckdb-v0.1.2
-        key: ${{ runner.os }}-duckdb-v0_1_2_007
+        path: duckdb-v0.2.2
+        key: ${{ runner.os }}-duckdb-v0_2_2_001
         restore-keys: |
-          ${{ runner.os }}-duckdb-v0_1_2
+          ${{ runner.os }}-duckdb-v0_2_2
 
-    - name: Build duckdb 0.1.2
-      if: steps.duckdb-cache-v0_1_2.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
+    - name: duckdb 0.2.1 cache
+      id: duckdb-cache-v0_2_1
       uses: actions/cache@v1.1.0
       with:
-        path: duckdb-v0.1.3
-        key: ${{ runner.os }}-duckdb-v0_1_3_001
+        path: duckdb-v0.2.1
+        key: ${{ runner.os }}-duckdb-v0_2_1_001
         restore-keys: |
-          ${{ runner.os }}-duckdb-v0_1_3
+          ${{ runner.os }}-duckdb-v0_2_1
+
+    - name: Build duckdb 0.2.2
+      if: steps.duckdb-cache-v0_2_2.outputs.cache-hit != 'true'
+      run: |
+        git clone -b v0.2.2 https://github.com/cwida/duckdb.git duckdb-tmp-v0.2.2
+        cd duckdb-tmp-v0.2.2 && make && cd ..
+        rm -rf duckdb-v0.2.2
+        mkdir -p duckdb-v0.2.2/build/release/src duckdb-v0.2.2/src
+        cp -rip duckdb-tmp-v0.2.2/build/release/src/*.so duckdb-v0.2.2/build/release/src
+        cp -rip duckdb-tmp-v0.2.2/src/include duckdb-v0.2.2/src/
 
-    - name: Build duckdb 0.1.3
-      if: steps.duckdb-cache-v0_1_3.outputs.cache-hit != 'true'
+    - name: Build duckdb 0.2.1
+      if: steps.duckdb-cache-v0_2_1.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.2.1 https://github.com/cwida/duckdb.git duckdb-tmp-v0.2.1
+        cd duckdb-tmp-v0.2.1 && make && cd ..
+        rm -rf duckdb-v0.2.1
+        mkdir -p duckdb-v0.2.1/build/release/src duckdb-v0.2.1/src
+        cp -rip duckdb-tmp-v0.2.1/build/release/src/*.so duckdb-v0.2.1/build/release/src
+        cp -rip duckdb-tmp-v0.2.1/src/include duckdb-v0.2.1/src/
 
     - name: Build and test with Rake with Ruby ${{ matrix.ruby }}
       env:

data/.travis.yml

@@ -2,19 +2,16 @@ language: ruby
 cache:
   bundler: true
   directories:
-    - ${HOME}/duckdb-v0.1.2
-    - ${HOME}/duckdb-v0.1.3
+    - ${HOME}/duckdb-v0.2.2
 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.2.2/build ]]; then cd ${HOME} && git clone -b v0.2.2 https://github.com/cwida/duckdb.git duckdb-v0.2.2 && cd duckdb-v0.2.2 && make && cd ${TRAVIS_BUILD_DIR}; fi
 
 env:
-  - DUCKDB_VERSION=0.1.2
-  - DUCKDB_VERSION=0.1.3
+  - DUCKDB_VERSION=0.2.2
 rvm:
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
   - 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,45 @@
 # ChangeLog
 
+## 0.0.10
+
+- bump DuckDB to v0.2.2
+- fix to build failure on MAC OS/X
+
+## 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
+- unsupport Ruby 2.4
+
+## 0.0.8
+
+- remove test with Ruby 2.4.10
+- bump DuckDB to v0.1.8
+- bump DuckDB to v0.1.8
+- bump DuckDB to v0.1.7
+  - current ruby-duckdb supports DuckDB version 0.1.5 and 0.1.6
+- support Ruby 2.7.1
+- bump DuckDB to v0.1.6
+  - current ruby-duckdb supports DuckDB version 0.1.5 and 0.1.6
+- DuckDB::Connection#connect accepts block
+- add DuckDB::Connection#connect
+- DuckDB::Database#connect accepts block
+- DuckDB::Database.open accepts block
+- update duckdb.gemspec, required ruby version >= 2.4.0
+
+## 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,14 +1,14 @@
 PATH
   remote: .
   specs:
-    duckdb (0.0.6)
+    duckdb (0.0.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.13.0)
+    minitest (5.14.2)
     rake (13.0.1)
-    rake-compiler (1.1.0)
+    rake-compiler (1.1.1)
       rake
 
 PLATFORMS

data/README.md

@@ -42,3 +42,24 @@ result.each do |row|
   p row
 end
 ```
+
+Or, you can use block.
+
+```
+require 'duckdb'
+
+DuckDB::Database.open do |db|
+  db.connect do |con|
+    con.query('CREATE TABLE users (id INTEGER, name VARCHAR(30))')
+
+    con.query("INSERT into users VALUES(1, 'Alice')")
+    con.query("INSERT into users VALUES(2, 'Bob')")
+    con.query("INSERT into users VALUES(3, 'Cathy')")
+
+    result = con.query('SELECT * from users')
+    result.each do |row|
+      p row
+    end
+  end
+end
+```

data/duckdb.gemspec

@@ -1,32 +1,35 @@
-lib = File.expand_path("lib", __dir__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "duckdb/version"
+require 'duckdb/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "duckdb"
+  spec.name          = 'duckdb'
   spec.version       = DuckDB::VERSION
-  spec.authors       = ["Masaki Suketa"]
-  spec.email         = ["masaki.suketa@nifty.ne.jp"]
+  spec.authors       = ['Masaki Suketa']
+  spec.email         = ['masaki.suketa@nifty.ne.jp']
 
-  spec.summary       = %q{This module is Ruby binding for DuckDB database engine.}
-  spec.description   = "This module is Ruby binding for DuckDB database engine. You must have the DuckDB engine installed to build/use this module."
-  spec.homepage      = "https://github.com/suketa/ruby-duckdb"
-  spec.license       = "MIT"
+  spec.summary       = 'This module is Ruby binding for DuckDB database engine.'
+  spec.description   = 'This module is Ruby binding for DuckDB database engine. You must have the DuckDB engine installed to build/use this module.'
+  spec.homepage      = 'https://github.com/suketa/ruby-duckdb'
+  spec.license       = 'MIT'
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/suketa/ruby-duckdb"
-  spec.metadata["changelog_uri"] = "https://github.com/suketa/ruby-duckdb/blob/master/CHANGELOG.md"
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/suketa/ruby-duckdb'
+  spec.metadata['changelog_uri'] = 'https://github.com/suketa/ruby-duckdb/blob/master/CHANGELOG.md'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.require_paths = ["lib"]
-  spec.extensions    = ["ext/duckdb/extconf.rb"]
+  spec.require_paths = ['lib']
+  spec.extensions    = ['ext/duckdb/extconf.rb']
+  spec.required_ruby_version = '>= 2.5.0'
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rake-compiler"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rake-compiler'
 end

data/ext/duckdb/connection.c

@@ -1,5 +1,7 @@
 #include "ruby-duckdb.h"
 
+VALUE cDuckDBConnection;
+
 static void deallocate(void *ctx)
 {
     rubyDuckDBConnection *p = (rubyDuckDBConnection *)ctx;
@@ -33,6 +35,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 +73,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 +88,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_private_method(cDuckDBConnection, "_connect", duckdb_connection_connect, 1);
     rb_define_private_method(cDuckDBConnection, "query_sql", duckdb_connection_query_sql, 1);
 }

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,10 +1,17 @@
 #include "ruby-duckdb.h"
 
+VALUE cDuckDBDatabase;
+
+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 +48,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_singleton_method(cDuckDBDatabase, "_open", duckdb_database_s_open, -1);
+    rb_define_private_method(cDuckDBDatabase, "_connect", duckdb_database_connect, 0);
+    rb_define_method(cDuckDBDatabase, "close", duckdb_database_close, 0);
 }

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,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) {
@@ -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;
 }
@@ -89,13 +89,13 @@ 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);
 
     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;
 }
@@ -103,13 +103,13 @@ 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);
-    int32_t i32val = NUM2LONG(val);
+    idx_t idx = check_index(vidx);
+    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;
 }
@@ -117,13 +117,13 @@ 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);
 
     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;
 }
@@ -131,13 +131,13 @@ 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);
 
     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;
 }
@@ -145,13 +145,13 @@ 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);
 
     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;
 }
@@ -159,28 +159,26 @@ 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) {
-        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_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) {
-        rb_raise(eDuckDBError, "fail to bind %ld parameter", idx);
+        rb_raise(eDuckDBError, "fail to bind %llu parameter", (unsigned long long)idx);
     }
     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/ext/duckdb/ruby-duckdb.h

@@ -10,5 +10,8 @@
 #include "./prepared_statement.h"
 
 extern VALUE mDuckDB;
+extern VALUE cDuckDBDatabase;
+extern VALUE cDuckDBConnection;
+extern VALUE eDuckDBError;
 
 #endif

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

@@ -29,6 +29,23 @@ module DuckDB
       stmt.execute
     end
 
+    #
+    # connects DuckDB database
+    # The first argument is DuckDB::Database object
+    #
+    def connect(db)
+      conn = _connect(db)
+      return conn unless block_given?
+
+      begin
+        yield conn
+      ensure
+        conn.disconnect
+      end
+    end
+
     alias execute query
+    alias open connect
+    alias close disconnect
   end
 end

data/lib/duckdb/database.rb

@@ -20,5 +20,58 @@ module DuckDB
   #   end
   #
   class Database
+    private_class_method :_open
+
+    class << self
+      ##
+      # Opens database.
+      # The first argument is DuckDB database file path to open.
+      # If there is no argument, the method opens DuckDB database in memory.
+      # The method yields block if block is given.
+      #
+      #   DuckDB::Database.open('duckdb_database.db') #=> DuckDB::Database
+      #
+      #   DuckDB::Database.open #=> opens DuckDB::Database in memory.
+      #
+      #   DuckDB::Database.open do |db|
+      #     con = db.connect
+      #     con.query('CREATE TABLE users (id INTEGER, name VARCHAR(30))')
+      #   end
+      #
+      def open(*args)
+        db = _open(*args)
+        return db unless block_given?
+
+        begin
+          yield db
+        ensure
+          db.close
+        end
+      end
+    end
+
+    ##
+    # connects database.
+    #
+    # The method yields block and disconnects the database if block given
+    #
+    #   db = DuckDB::Database.open
+    #
+    #   con = db.connect # => DuckDB::Connection
+    #
+    #   db.connect do |con|
+    #     con.query('CREATE TABLE users (id INTEGER, name VARCHAR(30))')
+    #   end
+    #
+    def connect
+      conn = _connect
+      return conn unless block_given?
+
+      begin
+        yield conn
+      ensure
+        conn.disconnect
+      end
+    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.6'.freeze
+  VERSION = '0.0.10'.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.10
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 description: This module is Ruby binding for DuckDB database engine. You must have
   the DuckDB engine installed to build/use this module.
 email:
@@ -121,14 +121,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.0.rc.2
 signing_key: 
 specification_version: 4
 summary: This module is Ruby binding for DuckDB database engine.