duckdb 0.2.9.0 → 0.3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af998f52f46c0ef8f51501333cbaf39d720daaa389eb618d7d7ad79627d70ad9
-  data.tar.gz: 8e1c5323fa2f917c9ab6050a0350e5e25b646559492501f636af026b79cb20f8
+  metadata.gz: ba5fa57fc1eaf1a2b0bb6ffa7379b8982d3858d17075c83b949af79331322a1e
+  data.tar.gz: cbe87ed1de6de024e9941e063102e7bf31a5407945d99180121a38fde703a8d4
 SHA512:
-  metadata.gz: 14809adeffb7bc79f2102e29f89a6fe6ea276ab38eaeabed9f3c18a023566c3bbad06c1ab31e55499e77d3f0f9ced186d618c24639b8c16ceff1ee61304f9f67
-  data.tar.gz: 15d164af6af9d985765d7b9fa87dcf7f9cf89fb2d691c9d44ea2d2bb72341a77213647cb08bcacc66094eb1622d250fe203f41a9529866af9f358518800f7183
+  metadata.gz: 52d8cff8db75e7e2d7f86632573fda6d1fe021e7ff38524edf9307e2d3c4720541daab609caee24307c3a8b6a0fa40d6b1cca4151d1edbb8b17f3c7f770bb7d3
+  data.tar.gz: 371925fa099235c382cdd370f0d43d346f40b9dc45332931956f953ab742b0a55ec7afa52f73aa942695fe30b1df78722e7afadb1de66a6250381fdf0ed990f8

data/.github/workflows/test_on_macos.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['2.6.8', '2.7.4', '3.0.2', 'head']
-        duckdb: ['0.2.8', '0.2.9']
+        duckdb: ['0.3.0', '0.3.1']
 
     steps:
     - uses: actions/checkout@v2
@@ -18,32 +18,17 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
 
-    - name: duckdb cache
-      id: duckdb-cache
-      uses: actions/cache@v2
-      with:
-        path: /usr/local/Cellar/duckdb@${{ matrix.duckdb }}
-        key: ${{ runner.os }}-duckdb-v${{ matrix.duckdb }}
-
-    - name: Install duckdb v${{ matrix.duckdb }} by brew
+    - name: download duckdb binary for MacOS 64bit
       env:
         DUCKDB_VERSION: ${{ matrix.duckdb }}
-      if: steps.duckdb-cache.outputs.cache-hit != 'true'
       run: |
-        brew tap-new duckdb/taps
-        brew extract duckdb duckdb/taps --version $DUCKDB_VERSION
-        brew install duckdb/taps/duckdb@$DUCKDB_VERSION
+        curl -OL https://github.com/duckdb/duckdb/releases/download/v${DUCKDB_VERSION}/libduckdb-osx-amd64.zip
 
-    - name: setup duckdb v${{ matrix.duckdb }} headers and libraries
-      env:
-        DUCKDB_VERSION: ${{ matrix.duckdb }}
+    - name: extract zip file
       run: |
-        if [ ! -L /usr/local/include/duckdb.h ]; then
-          header=`find /usr/local/Cellar/duckdb@$DUCKDB_VERSION -name "duckdb.h"`
-          lib=`find /usr/local/Cellar/duckdb@$DUCKDB_VERSION -name "libduckdb.dylib"`
-          ln -s $header /usr/local/include/duckdb.h
-          ln -s $lib /usr/local/lib/libduckdb.dylib
-        fi
+        unzip libduckdb-osx-amd64.zip
+        cp duckdb.h /usr/local/include
+        cp libduckdb.dylib /usr/local/lib
 
     - name: Build and test with Rake with Ruby ${{ matrix.ruby }}
       run: |

data/.github/workflows/test_on_ubuntu.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['2.6.8', '2.7.4', '3.0.2', 'head']
-        duckdb: ['0.2.8', '0.2.9']
+        duckdb: ['0.3.0', '0.3.1']
 
     steps:
     - uses: actions/checkout@v2

data/.github/workflows/test_on_windows.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['2.6.8', '2.7.4', '3.0.2', 'head']
-        duckdb: ['0.2.8', '0.2.9']
+        duckdb: ['0.3.0', '0.3.1']
 
     steps:
     - uses: actions/checkout@v2
@@ -36,8 +36,6 @@ jobs:
       run: |
         cp duckdb.dll C:/Windows/System32/
 
-    # FIXME: rake test fails with LoadError
-    # C:/hostedtoolcache/windows/Ruby/2.7.3/x64/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:83:in `require': 126: The specified module could not be found.   - D:/a/ruby-duckdb/ruby-duckdb/lib/duckdb/duckdb_native.so (LoadError)`
     - name: rake test
       run: |
         rake test

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # ChangeLog
 
+# 0.3.1.0
+
+- bump duckdb to 0.3.1 in CI.
+- bump duckdb to 0.3.0 in CI.
+- append_time, append_date, append_timestamp of DuckDB::Appender accept argument
+  having to_str to convert time string.
+
 # 0.2.9.0
 
 - add DuckDB::Appender#append

data/Gemfile.lock

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

data/ext/duckdb/connection.c

@@ -2,22 +2,25 @@
 
 VALUE cDuckDBConnection;
 
-static void deallocate(void *ctx)
-{
+static void deallocate(void *ctx);
+static VALUE allocate(VALUE klass);
+static VALUE duckdb_connection_disconnect(VALUE self);
+static VALUE duckdb_connection_connect(VALUE self, VALUE oDuckDBDatabase);
+static VALUE duckdb_connection_query_sql(VALUE self, VALUE str);
+
+static void deallocate(void *ctx) {
     rubyDuckDBConnection *p = (rubyDuckDBConnection *)ctx;
 
     duckdb_disconnect(&(p->con));
     xfree(p);
 }
 
-static VALUE allocate(VALUE klass)
-{
+static VALUE allocate(VALUE klass) {
     rubyDuckDBConnection *ctx = xcalloc((size_t)1, sizeof(rubyDuckDBConnection));
     return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
 }
 
-VALUE create_connection(VALUE oDuckDBDatabase)
-{
+VALUE create_connection(VALUE oDuckDBDatabase) {
     rubyDuckDB *ctxdb;
     rubyDuckDBConnection *ctxcon;
     VALUE obj;
@@ -35,8 +38,7 @@ VALUE create_connection(VALUE oDuckDBDatabase)
     return obj;
 }
 
-static VALUE duckdb_connection_disconnect(VALUE self)
-{
+static VALUE duckdb_connection_disconnect(VALUE self) {
     rubyDuckDBConnection *ctx;
 
     Data_Get_Struct(self, rubyDuckDBConnection, ctx);
@@ -45,8 +47,7 @@ static VALUE duckdb_connection_disconnect(VALUE self)
     return self;
 }
 
-static VALUE duckdb_connection_connect(VALUE self, VALUE oDuckDBDatabase)
-{
+static VALUE duckdb_connection_connect(VALUE self, VALUE oDuckDBDatabase) {
     rubyDuckDBConnection *ctx;
     rubyDuckDB *ctxdb;
 
@@ -63,8 +64,7 @@ static VALUE duckdb_connection_connect(VALUE self, VALUE oDuckDBDatabase)
     return self;
 }
 
-static VALUE duckdb_connection_query_sql(VALUE self, VALUE str)
-{
+static VALUE duckdb_connection_query_sql(VALUE self, VALUE str) {
     rubyDuckDBConnection *ctx;
     rubyDuckDBResult *ctxr;
 

data/ext/duckdb/database.c

@@ -7,28 +7,26 @@ static void deallocate(void * ctx);
 static VALUE allocate(VALUE klass);
 static VALUE duckdb_database_s_open(int argc, VALUE *argv, VALUE cDuckDBDatabase);
 static VALUE duckdb_database_s_open_ext(int argc, VALUE *argv, VALUE cDuckDBDatabase);
+static VALUE duckdb_database_connect(VALUE self);
+static VALUE duckdb_database_close(VALUE self);
 
-static void close_database(rubyDuckDB *p)
-{
+static void close_database(rubyDuckDB *p) {
     duckdb_close(&(p->db));
 }
 
-static void deallocate(void * ctx)
-{
+static void deallocate(void * ctx) {
     rubyDuckDB *p = (rubyDuckDB *)ctx;
 
     close_database(p);
     xfree(p);
 }
 
-static VALUE allocate(VALUE klass)
-{
+static VALUE allocate(VALUE klass) {
     rubyDuckDB *ctx = xcalloc((size_t)1, sizeof(rubyDuckDB));
     return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
 }
 
-static VALUE duckdb_database_s_open(int argc, VALUE *argv, VALUE cDuckDBDatabase)
-{
+static VALUE duckdb_database_s_open(int argc, VALUE *argv, VALUE cDuckDBDatabase) {
     rubyDuckDB *ctx;
     VALUE obj;
 
@@ -50,8 +48,7 @@ static VALUE duckdb_database_s_open(int argc, VALUE *argv, VALUE cDuckDBDatabase
 }
 
 #ifdef HAVE_DUCKDB_OPEN_EXT
-static VALUE duckdb_database_s_open_ext(int argc, VALUE *argv, VALUE cDuckDBDatabase)
-{
+static VALUE duckdb_database_s_open_ext(int argc, VALUE *argv, VALUE cDuckDBDatabase) {
     rubyDuckDB *ctx;
     VALUE obj;
     rubyDuckDBConfig *ctx_config;
@@ -86,8 +83,7 @@ static VALUE duckdb_database_s_open_ext(int argc, VALUE *argv, VALUE cDuckDBData
 }
 #endif /* HAVE_DUCKDB_OPEN_EXT */
 
-static VALUE duckdb_database_connect(VALUE self)
-{
+static VALUE duckdb_database_connect(VALUE self) {
     return create_connection(self);
 }
 
@@ -97,16 +93,14 @@ static VALUE duckdb_database_connect(VALUE self)
  *
  *  closes DuckDB database.
  */
-static VALUE duckdb_database_close(VALUE self)
-{
+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)
-{
+void init_duckdb_database(void) {
     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);

data/lib/duckdb/appender.rb

@@ -63,18 +63,16 @@ module DuckDB
       #   appender.flush
       #
       def append_date(value)
-        case value
-        when Date, Time
-          date = value
-        when String
-          begin
-            date = Date.parse(value)
-          rescue
-            raise(ArgumentError, "Cannot parse argument `#{value}` to Date.")
-          end
-        else
-          raise(ArgumentError, "Argument `#{value}` must be Date, Time or String.")
-        end
+        date = case value
+               when Date, Time
+                 value
+               else
+                 begin
+                   Date.parse(value)
+                 rescue
+                   raise(ArgumentError, "Cannot parse argument `#{value}` to Date.")
+                 end
+               end
 
         _append_date(date.year, date.month, date.day)
       end
@@ -95,18 +93,16 @@ module DuckDB
       #   appender.flush
       #
       def append_time(value)
-        case value
-        when Time
-          time = value
-        when String
-          begin
-            time = Time.parse(value)
-          rescue
-            raise(ArgumentError, "Cannot parse argument `#{value}` to Time.")
-          end
-        else
-          raise(ArgumentError, "Argument `#{value}` must be Time or String.")
-        end
+        time = case value
+               when Time
+                 value
+               else
+                 begin
+                   Time.parse(value)
+                 rescue
+                   raise(ArgumentError, "Cannot parse argument `#{value}` to Time.")
+                 end
+               end
 
         _append_time(time.hour, time.min, time.sec, time.usec)
       end
@@ -128,20 +124,19 @@ module DuckDB
       #   appender.flush
       #
       def append_timestamp(value)
-        case value
-        when Time
-          time = value
-        when Date
-          time = value.to_time
-        when String
-          begin
-            time = Time.parse(value)
-          rescue
-            raise(ArgumentError, "Cannot parse argument `#{value.class} #{value}` to Time.")
-          end
-        else
-          raise(ArgumentError, "Argument `#{value.class} #{value}` must be Time or Date or String.")
-        end
+        time = case value
+               when Time
+                 value
+               when Date
+                 value.to_time
+               else
+                 begin
+                   Time.parse(value)
+                 rescue
+                   raise(ArgumentError, "Cannot parse argument `#{value}` to Time or Date.")
+                 end
+               end
+
         _append_timestamp(time.year, time.month, time.day, time.hour, time.min, time.sec, time.nsec / 1000)
       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.2.9.0'.freeze
+  VERSION = '0.3.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 0.2.9.0
+  version: 0.3.1.0
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-24 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler