duckdb 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56df52ba6cb0fad781ea353ba7bba30409342ceeb3f19e819b40edab43405b3d
-  data.tar.gz: b90b227e391ffadce51f01a99115c9aca102ebaf3ef99b78ff674792eb93d6d1
+  metadata.gz: 599ebecd3f693be06ff46fec535485d6ac6019cd889405a502d21a2f801c9ba8
+  data.tar.gz: '0811911b5f0c3404f8c7ff9c2351d97668013dd576d4f5a98775e9af45df5e52'
 SHA512:
-  metadata.gz: f35dd8aaef3fb2533192ad49f890e8c6d79000a485e399ac9ce9eeb7baae3960c15a5d3c0ab46200a9ea2c63b4b159066eae8c02a202364ce782085a92c13f2b
-  data.tar.gz: 84615e60ca4d5937e7f6f2a9ecdb6c6fd7d23eafcca37e82d29c6fcc417ff0eb50bd14efe6ded62ed4019b5815b87e334ed6293c6d5bfe1c5897342a12f60518
+  metadata.gz: b4ca8e956de0edbb9aa9ceed9273a48f3cf847e5ff79732b849465c59fa2030af5cd81c62344e953e96990e11c48ff1b2dd8bd3cd87f3bc8271079aeb69a31bd
+  data.tar.gz: 3501865c8c0aa7c70761705e06026aadd95e112d34fd9eed1152ae269407fddc7cdbe6a84f6f3f8cda917022bda45fb0d349b51400b939f43b74ae64bb8e43bf

data/CHANGELOG.md

@@ -1,8 +1,19 @@
 # ChangeLog
 
+## 0.0.5
+
+- add `DuckDB::Error`
+- `DuckDB::Result#each` convert DuckDB number value to Ruby's number
+- `DuckDB::Result#each` convert DuckDB NULL value to nil
+- `DuckDB::Result#each` returns Enumerator object when block is not given
+- `DuckDB::Result` include `Enumerable`
+- add test for `DuckDB::Result`
+- add test for `DuckDB::Connection`
+- fix description in duckdb.gemspec
+
 ## 0.0.4
 
-- add Test for `DuckDB::Database`
+- add test for `DuckDB::Database`
 - rename module name to `DuckDB` from `Duckdb`
 
 ## 0.0.3

data/Gemfile.lock

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

data/duckdb.gemspec

@@ -9,13 +9,13 @@ Gem::Specification.new do |spec|
   spec.email         = ["masaki.suketa@nifty.ne.jp"]
 
   spec.summary       = %q{This module is Ruby binding for DuckDB database engine.}
-  spec.description   = %q{This module is Ruby binding for DuckDB database engine.\nYou must have the DuckDB engine installed to build/use this module.}
+  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/CHANGELOG.md"
+  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.

data/ext/duckdb/connection.c

@@ -27,7 +27,7 @@ VALUE create_connection(VALUE oDuckDBDatabase) {
     Data_Get_Struct(obj, rubyDuckDBConnection, ctxcon);
 
     if (duckdb_connect(ctxdb->db, &(ctxcon->con)) == DuckDBError) {
-        rb_raise(rb_eRuntimeError, "connection error");
+        rb_raise(eDuckDBError, "connection error");
     }
 
     // rb_ivar_set(obj, rb_intern("database"), oDuckDBDatabase);
@@ -45,7 +45,7 @@ static VALUE duckdb_connection_query(VALUE self, VALUE str) {
     Data_Get_Struct(result, rubyDuckDBResult, ctxr);
 
     if (duckdb_query(ctx->con, StringValueCStr(str), &(ctxr->result)) == DuckDBError) {
-        rb_raise(rb_eRuntimeError, "%s", ctxr->result.error_message);
+        rb_raise(eDuckDBError, "%s", ctxr->result.error_message);
     }
     return result;
 }

data/ext/duckdb/database.c

@@ -31,7 +31,7 @@ static VALUE duckdb_database_s_open(int argc, VALUE *argv, VALUE cDuckDBDatabase
     Data_Get_Struct(obj, rubyDuckDB, ctx);
     if (duckdb_open(pfile, &(ctx->db)) == DuckDBError)
     {
-        rb_raise(rb_eRuntimeError, "Failed to open database"); /* FIXME */
+        rb_raise(eDuckDBError, "Failed to open database"); /* FIXME */
     }
     return obj;
 }

data/ext/duckdb/duckdb.c

@@ -6,6 +6,7 @@ void
 Init_duckdb_native(void) {
     mDuckDB = rb_define_module("DuckDB");
 
+    init_duckdb_error();
     init_duckdb_database();
     init_duckdb_connection();
     init_duckdb_result();

data/ext/duckdb/error.c

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

data/ext/duckdb/error.h

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

data/ext/duckdb/result.c

@@ -16,23 +16,84 @@ static VALUE allocate(VALUE klass)
     return Data_Wrap_Struct(klass, NULL, deallocate, ctx);
 }
 
+static VALUE to_ruby_obj_boolean(duckdb_result *result, size_t col_idx, size_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, size_t col_idx, size_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, size_t col_idx, size_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, size_t col_idx, size_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, size_t col_idx, size_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, size_t col_idx, size_t row_idx) {
+    double dval = duckdb_value_double(result, col_idx, row_idx);
+    return DBL2NUM(dval);
+}
+
+static VALUE to_ruby_obj(duckdb_result *result, size_t col_idx, size_t row_idx) {
+    char *p;
+    VALUE obj = Qnil;
+    if (result->columns[col_idx].nullmask[row_idx]) {
+        return obj;
+    }
+    switch(result->columns[col_idx].type) {
+    case DUCKDB_TYPE_BOOLEAN:
+        return to_ruby_obj_boolean(result, col_idx, row_idx);
+    case DUCKDB_TYPE_SMALLINT:
+        return to_ruby_obj_smallint(result, col_idx, row_idx);
+    case DUCKDB_TYPE_INTEGER:
+        return to_ruby_obj_integer(result, col_idx, row_idx);
+    case DUCKDB_TYPE_BIGINT:
+        return to_ruby_obj_bigint(result, col_idx, row_idx);
+    case DUCKDB_TYPE_FLOAT:
+        return to_ruby_obj_float(result, col_idx, row_idx);
+    case DUCKDB_TYPE_DOUBLE:
+        return to_ruby_obj_double(result, col_idx, row_idx);
+    default:
+        p = duckdb_value_varchar(result, col_idx, row_idx);
+        obj = rb_str_new2(p);
+        free(p);
+    }
+    return obj;
+}
+
 static VALUE row_array(rubyDuckDBResult *ctx, size_t row_idx) {
     size_t col_idx;
     VALUE ary = rb_ary_new2(ctx->result.column_count);
     for(col_idx = 0; col_idx < ctx->result.column_count; col_idx++) {
-        char *p = duckdb_value_varchar(&(ctx->result), col_idx, row_idx);
-        rb_ary_store(ary, col_idx, rb_str_new2(p));
-
-        free(p);
+        rb_ary_store(ary, col_idx, to_ruby_obj(&(ctx->result), col_idx, row_idx));
     }
     return ary;
 }
 
+static VALUE duckdb_result_row_size(VALUE oDuckDBResult, VALUE args, VALUE obj) {
+    rubyDuckDBResult *ctx;
+    Data_Get_Struct(oDuckDBResult, rubyDuckDBResult, ctx);
+
+    return LONG2FIX(ctx->result.row_count);
+}
+
 static VALUE duckdb_result_each(VALUE oDuckDBResult) {
     rubyDuckDBResult *ctx;
     size_t row_idx = 0;
 
-    // RETURN_ENUMERATOR(oDuckDBResult, 0, 0);
+    RETURN_SIZED_ENUMERATOR(oDuckDBResult, 0, 0, duckdb_result_row_size);
 
     Data_Get_Struct(oDuckDBResult, rubyDuckDBResult, ctx);
     for (row_idx = 0; row_idx < ctx->result.row_count; row_idx++) {

data/ext/duckdb/ruby-duckdb.h

@@ -3,6 +3,7 @@
 
 #include "ruby.h"
 #include <duckdb.h>
+#include "./error.h"
 #include "./database.h"
 #include "./connection.h"
 #include "./result.h"

data/lib/duckdb.rb

@@ -1,5 +1,6 @@
-require "duckdb/version"
-require "duckdb/duckdb_native"
+require 'duckdb/version'
+require 'duckdb/duckdb_native'
+require 'duckdb/result'
 
 module DuckDB
 end

data/lib/duckdb/result.rb

@@ -0,0 +1,5 @@
+module DuckDB
+  class Result
+    include Enumerable
+  end
+end

data/lib/duckdb/version.rb

@@ -1,3 +1,3 @@
 module DuckDB
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-02 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: This module is Ruby binding for DuckDB database engine.\nYou must have
+description: This module is Ruby binding for DuckDB database engine. You must have
   the DuckDB engine installed to build/use this module.
 email:
 - masaki.suketa@nifty.ne.jp
@@ -91,11 +91,14 @@ files:
 - ext/duckdb/database.c
 - ext/duckdb/database.h
 - ext/duckdb/duckdb.c
+- ext/duckdb/error.c
+- ext/duckdb/error.h
 - ext/duckdb/extconf.rb
 - ext/duckdb/result.c
 - ext/duckdb/result.h
 - ext/duckdb/ruby-duckdb.h
 - lib/duckdb.rb
+- lib/duckdb/result.rb
 - lib/duckdb/version.rb
 homepage: https://github.com/suketa/ruby-duckdb
 licenses:
@@ -103,7 +106,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/suketa/ruby-duckdb
   source_code_uri: https://github.com/suketa/ruby-duckdb
-  changelog_uri: https://github.com/suketa/ruby-duckdb/CHANGELOG.md
+  changelog_uri: https://github.com/suketa/ruby-duckdb/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: