duckdb 1.1.3.1 → 1.2.0.0

data/ext/duckdb/column.c

@@ -6,6 +6,7 @@ static void deallocate(void *ctx);
 static VALUE allocate(VALUE klass);
 static size_t memsize(const void *p);
 static VALUE duckdb_column__type(VALUE oDuckDBColumn);
+static VALUE duckdb_column__logical_type(VALUE oDuckDBColumn);
 static VALUE duckdb_column_get_name(VALUE oDuckDBColumn);
 
 static const rb_data_type_t column_data_type = {
@@ -29,9 +30,7 @@ static size_t memsize(const void *p) {
     return sizeof(rubyDuckDBColumn);
 }
 
-/*
- *
- */
+/* :nodoc: */
 VALUE duckdb_column__type(VALUE oDuckDBColumn) {
     rubyDuckDBColumn *ctx;
     rubyDuckDBResult *ctxresult;
@@ -47,6 +46,33 @@ VALUE duckdb_column__type(VALUE oDuckDBColumn) {
     return INT2FIX(type);
 }
 
+/*
+ *  call-seq:
+ *    column.logical_type -> DuckDB::LogicalType
+ *
+ *  Returns the logical type class.
+ *
+ */
+VALUE duckdb_column__logical_type(VALUE oDuckDBColumn) {
+    rubyDuckDBColumn *ctx;
+    rubyDuckDBResult *ctxresult;
+    VALUE result;
+    duckdb_logical_type _logical_type;
+    VALUE logical_type = Qnil;
+
+    TypedData_Get_Struct(oDuckDBColumn, rubyDuckDBColumn, &column_data_type, ctx);
+
+    result = rb_ivar_get(oDuckDBColumn, rb_intern("result"));
+    ctxresult = get_struct_result(result);
+    _logical_type = duckdb_column_logical_type(&(ctxresult->result), ctx->col);
+
+    if (_logical_type) {
+        logical_type = rbduckdb_create_logical_type(_logical_type);
+    }
+
+    return logical_type;
+}
+
 /*
  *  call-seq:
  *    column.name -> string.
@@ -82,9 +108,13 @@ VALUE rbduckdb_create_column(VALUE oDuckDBResult, idx_t col) {
 }
 
 void rbduckdb_init_duckdb_column(void) {
+#if 0
+    VALUE mDuckDB = rb_define_module("DuckDB");
+#endif
     cDuckDBColumn = rb_define_class_under(mDuckDB, "Column", rb_cObject);
     rb_define_alloc_func(cDuckDBColumn, allocate);
 
     rb_define_private_method(cDuckDBColumn, "_type", duckdb_column__type, 0);
+    rb_define_method(cDuckDBColumn, "logical_type", duckdb_column__logical_type, 0);
     rb_define_method(cDuckDBColumn, "name", duckdb_column_get_name, 0);
 }

data/ext/duckdb/config.c

@@ -80,6 +80,9 @@ static VALUE config_set_config(VALUE self, VALUE key, VALUE value) {
 }
 
 void rbduckdb_init_duckdb_config(void) {
+#if 0
+    VALUE mDuckDB = rb_define_module("DuckDB");
+#endif
     cDuckDBConfig = rb_define_class_under(mDuckDB, "Config", rb_cObject);
     rb_define_alloc_func(cDuckDBConfig, allocate);
     rb_define_singleton_method(cDuckDBConfig, "size", config_s_size, 0);

data/ext/duckdb/connection.c

@@ -114,6 +114,7 @@ static VALUE duckdb_connection_query_progress(VALUE self) {
     return rb_funcall(mDuckDBConverter, rb_intern("_to_query_progress"), 3, DBL2NUM(progress.percentage), ULL2NUM(progress.rows_processed), ULL2NUM(progress.total_rows_to_process));
 }
 
+/* :nodoc: */
 static VALUE duckdb_connection_connect(VALUE self, VALUE oDuckDBDatabase) {
     rubyDuckDBConnection *ctx;
     rubyDuckDB *ctxdb;
@@ -131,6 +132,7 @@ static VALUE duckdb_connection_connect(VALUE self, VALUE oDuckDBDatabase) {
     return self;
 }
 
+/* :nodoc: */
 static VALUE duckdb_connection_query_sql(VALUE self, VALUE str) {
     rubyDuckDBConnection *ctx;
     rubyDuckDBResult *ctxr;
@@ -151,6 +153,9 @@ static VALUE duckdb_connection_query_sql(VALUE self, VALUE str) {
 }
 
 void rbduckdb_init_duckdb_connection(void) {
+#if 0
+    VALUE mDuckDB = rb_define_module("DuckDB");
+#endif
     cDuckDBConnection = rb_define_class_under(mDuckDB, "Connection", rb_cObject);
     rb_define_alloc_func(cDuckDBConnection, allocate);
 
@@ -158,5 +163,6 @@ void rbduckdb_init_duckdb_connection(void) {
     rb_define_method(cDuckDBConnection, "interrupt", duckdb_connection_interrupt, 0);
     rb_define_method(cDuckDBConnection, "query_progress", duckdb_connection_query_progress, 0);
     rb_define_private_method(cDuckDBConnection, "_connect", duckdb_connection_connect, 1);
+    /* TODO: query_sql => _query_sql */
     rb_define_private_method(cDuckDBConnection, "query_sql", duckdb_connection_query_sql, 1);
 }

data/ext/duckdb/database.c

@@ -43,6 +43,7 @@ rubyDuckDB *rbduckdb_get_struct_database(VALUE obj) {
     return ctx;
 }
 
+/* :nodoc: */
 static VALUE duckdb_database_s_open(int argc, VALUE *argv, VALUE cDuckDBDatabase) {
     rubyDuckDB *ctx;
     VALUE obj;
@@ -64,6 +65,7 @@ static VALUE duckdb_database_s_open(int argc, VALUE *argv, VALUE cDuckDBDatabase
     return obj;
 }
 
+/* :nodoc: */
 static VALUE duckdb_database_s_open_ext(int argc, VALUE *argv, VALUE cDuckDBDatabase) {
     rubyDuckDB *ctx;
     VALUE obj;
@@ -98,6 +100,7 @@ static VALUE duckdb_database_s_open_ext(int argc, VALUE *argv, VALUE cDuckDBData
     return obj;
 }
 
+/* :nodoc: */
 static VALUE duckdb_database_connect(VALUE self) {
     return rbduckdb_create_connection(self);
 }
@@ -116,6 +119,9 @@ static VALUE duckdb_database_close(VALUE self) {
 }
 
 void rbduckdb_init_duckdb_database(void) {
+#if 0
+    VALUE mDuckDB = rb_define_module("DuckDB");
+#endif
     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/ext/duckdb/duckdb.c

@@ -31,6 +31,7 @@ Init_duckdb_native(void) {
     rbduckdb_init_duckdb_connection();
     rbduckdb_init_duckdb_result();
     rbduckdb_init_duckdb_column();
+    rbduckdb_init_duckdb_logical_type();
     rbduckdb_init_duckdb_prepared_statement();
     rbduckdb_init_duckdb_pending_result();
     rbduckdb_init_duckdb_blob();

data/ext/duckdb/error.c

@@ -3,5 +3,8 @@
 VALUE eDuckDBError;
 
 void rbduckdb_init_duckdb_error(void) {
+#if 0
+    VALUE mDuckDB = rb_define_module("DuckDB");
+#endif
     eDuckDBError = rb_define_class_under(mDuckDB, "Error", rb_eStandardError);
 }

data/ext/duckdb/extconf.rb

@@ -61,9 +61,6 @@ check_duckdb_library('duckdb', 'duckdb_appender_column_count', DUCKDB_REQUIRED_V
 # check duckdb >= 1.0.0
 have_func('duckdb_fetch_chunk', 'duckdb.h')
 
-# check duckdb >= 1.0.0
-have_func('duckdb_fetch_chunk', 'duckdb.h')
-
 # check duckdb >= 1.1.0
 have_func('duckdb_result_error_type', 'duckdb.h')
 

data/ext/duckdb/extracted_statements.c

@@ -95,6 +95,9 @@ static VALUE duckdb_extracted_statements_prepared_statement(VALUE self, VALUE co
 }
 
 void rbduckdb_init_duckdb_extracted_statements(void) {
+#if 0
+    VALUE mDuckDB = rb_define_module("DuckDB");
+#endif
     cDuckDBExtractedStatements = rb_define_class_under(mDuckDB, "ExtractedStatementsImpl", rb_cObject);
 
     rb_define_alloc_func(cDuckDBExtractedStatements, allocate);

data/ext/duckdb/logical_type.c

@@ -0,0 +1,187 @@
+#include "ruby-duckdb.h"
+
+static VALUE cDuckDBLogicalType;
+
+static void deallocate(void *ctx);
+static VALUE allocate(VALUE klass);
+static size_t memsize(const void *p);
+static VALUE duckdb_logical_type__type(VALUE self);
+static VALUE duckdb_logical_type_width(VALUE self);
+static VALUE duckdb_logical_type_scale(VALUE self);
+static VALUE duckdb_logical_type_child_type(VALUE self);
+static VALUE duckdb_logical_type_size(VALUE self);
+static VALUE duckdb_logical_type_key_type(VALUE self);
+static VALUE duckdb_logical_type_value_type(VALUE self);
+
+static const rb_data_type_t logical_type_data_type = {
+    "DuckDB/LogicalType",
+    {NULL, deallocate, memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static void deallocate(void *ctx) {
+    rubyDuckDBLogicalType *p = (rubyDuckDBLogicalType *)ctx;
+
+    if (p->logical_type) {
+        duckdb_destroy_logical_type(&(p->logical_type));
+    }
+
+    xfree(p);
+}
+
+static VALUE allocate(VALUE klass) {
+    rubyDuckDBLogicalType *ctx = xcalloc((size_t)1, sizeof(rubyDuckDBLogicalType));
+    return TypedData_Wrap_Struct(klass, &logical_type_data_type, ctx);
+}
+
+static size_t memsize(const void *p) {
+    return sizeof(rubyDuckDBLogicalType);
+}
+
+/*
+ *  call-seq:
+ *    decimal_col.logical_type.type -> Symbol
+ *
+ *  Returns the logical type's type symbol.
+ *
+ */
+static VALUE duckdb_logical_type__type(VALUE self) {
+    rubyDuckDBLogicalType *ctx;
+    TypedData_Get_Struct(self, rubyDuckDBLogicalType, &logical_type_data_type, ctx);
+    return INT2FIX(duckdb_get_type_id(ctx->logical_type));
+}
+
+/*
+ *  call-seq:
+ *    decimal_col.logical_type.width -> Integer
+ *
+ *  Returns the width of the decimal column.
+ *
+ */
+static VALUE duckdb_logical_type_width(VALUE self) {
+    rubyDuckDBLogicalType *ctx;
+    TypedData_Get_Struct(self, rubyDuckDBLogicalType, &logical_type_data_type, ctx);
+    return INT2FIX(duckdb_decimal_width(ctx->logical_type));
+}
+
+/*
+ *  call-seq:
+ *    decimal_col.logical_type.scale -> Integer
+ *
+ *  Returns the scale of the decimal column.
+ *
+ */
+static VALUE duckdb_logical_type_scale(VALUE self) {
+    rubyDuckDBLogicalType *ctx;
+    TypedData_Get_Struct(self, rubyDuckDBLogicalType, &logical_type_data_type, ctx);
+    return INT2FIX(duckdb_decimal_scale(ctx->logical_type));
+}
+
+/*
+ *  call-seq:
+ *    list_col.logical_type.child_type -> DuckDB::LogicalType
+ *
+ *  Returns the child logical type for list and map types, otherwise nil.
+ *
+ */
+static VALUE duckdb_logical_type_child_type(VALUE self) {
+    rubyDuckDBLogicalType *ctx;
+    duckdb_type type_id;
+    duckdb_logical_type child_logical_type;
+    VALUE logical_type = Qnil;
+
+    TypedData_Get_Struct(self, rubyDuckDBLogicalType, &logical_type_data_type, ctx);
+    type_id = duckdb_get_type_id(ctx->logical_type);
+
+    switch(type_id) {
+        case DUCKDB_TYPE_LIST:
+        case DUCKDB_TYPE_MAP:
+            child_logical_type = duckdb_list_type_child_type(ctx->logical_type);
+            logical_type = rbduckdb_create_logical_type(child_logical_type);
+            break;
+        case DUCKDB_TYPE_ARRAY:
+            child_logical_type = duckdb_array_type_child_type(ctx->logical_type);
+            logical_type = rbduckdb_create_logical_type(child_logical_type);
+            break;
+        default:
+            logical_type = Qnil;
+    }
+    return logical_type;
+}
+
+/*
+ *  call-seq:
+ *    list_col.logical_type.size -> Integer
+ *
+ *  Returns the size of the array column, otherwise 0.
+ *
+ */
+static VALUE duckdb_logical_type_size(VALUE self) {
+    rubyDuckDBLogicalType *ctx;
+    TypedData_Get_Struct(self, rubyDuckDBLogicalType, &logical_type_data_type, ctx);
+    return INT2FIX(duckdb_array_type_array_size(ctx->logical_type));
+}
+
+/*
+ *  call-seq:
+ *    map_col.logical_type.key_type -> DuckDB::LogicalType
+ *
+ *  Returns the key logical type for map type, otherwise nil.
+ *
+ */
+static VALUE duckdb_logical_type_key_type(VALUE self) {
+    rubyDuckDBLogicalType *ctx;
+    duckdb_logical_type key_logical_type;
+    VALUE logical_type = Qnil;
+
+    TypedData_Get_Struct(self, rubyDuckDBLogicalType, &logical_type_data_type, ctx);
+    key_logical_type = duckdb_map_type_key_type(ctx->logical_type);
+    logical_type = rbduckdb_create_logical_type(key_logical_type);
+    return logical_type;
+}
+
+/*
+ *  call-seq:
+ *    map_col.logical_type.value_type -> DuckDB::LogicalType
+ *
+ *  Returns the value logical type for map type, otherwise nil.
+ *
+ */
+static VALUE duckdb_logical_type_value_type(VALUE self) {
+    rubyDuckDBLogicalType *ctx;
+    duckdb_logical_type value_logical_type;
+    VALUE logical_type = Qnil;
+
+    TypedData_Get_Struct(self, rubyDuckDBLogicalType, &logical_type_data_type, ctx);
+    value_logical_type = duckdb_map_type_value_type(ctx->logical_type);
+    logical_type = rbduckdb_create_logical_type(value_logical_type);
+    return logical_type;
+}
+
+VALUE rbduckdb_create_logical_type(duckdb_logical_type logical_type) {
+    VALUE obj;
+    rubyDuckDBLogicalType *ctx;
+
+    obj = allocate(cDuckDBLogicalType);
+    TypedData_Get_Struct(obj, rubyDuckDBLogicalType, &logical_type_data_type, ctx);
+
+    ctx->logical_type = logical_type;
+
+    return obj;
+}
+
+void rbduckdb_init_duckdb_logical_type(void) {
+#if 0
+    VALUE mDuckDB = rb_define_module("DuckDB");
+#endif
+    cDuckDBLogicalType = rb_define_class_under(mDuckDB, "LogicalType", rb_cObject);
+    rb_define_alloc_func(cDuckDBLogicalType, allocate);
+
+    rb_define_private_method(cDuckDBLogicalType, "_type", duckdb_logical_type__type, 0);
+    rb_define_method(cDuckDBLogicalType, "width", duckdb_logical_type_width, 0);
+    rb_define_method(cDuckDBLogicalType, "scale", duckdb_logical_type_scale, 0);
+    rb_define_method(cDuckDBLogicalType, "child_type", duckdb_logical_type_child_type, 0);
+    rb_define_method(cDuckDBLogicalType, "size", duckdb_logical_type_size, 0);
+    rb_define_method(cDuckDBLogicalType, "key_type", duckdb_logical_type_key_type, 0);
+    rb_define_method(cDuckDBLogicalType, "value_type", duckdb_logical_type_value_type, 0);
+}

data/ext/duckdb/logical_type.h

@@ -0,0 +1,13 @@
+#ifndef RUBY_DUCKDB_LOGICAL_TYPE_H
+#define RUBY_DUCKDB_LOGICAL_TYPE_H
+
+struct _rubyDuckDBLogicalType {
+    duckdb_logical_type logical_type;
+};
+
+typedef struct _rubyDuckDBLogicalType rubyDuckDBLogicalType;
+
+void rbduckdb_init_duckdb_logical_type(void);
+VALUE rbduckdb_create_logical_type(duckdb_logical_type logical_type);
+
+#endif

data/ext/duckdb/pending_result.c

@@ -124,11 +124,13 @@ static VALUE duckdb_pending_result_execute_pending(VALUE self) {
     return result;
 }
 
+/* :nodoc: */
 static VALUE duckdb_pending_result__state(VALUE self) {
     rubyDuckDBPendingResult *ctx = get_struct_pending_result(self);
     return INT2FIX(ctx->state);
 }
 
+/* :nodoc: */
 static VALUE duckdb_pending_result__execute_check_state(VALUE self) {
     rubyDuckDBPendingResult *ctx = get_struct_pending_result(self);
     return INT2FIX(duckdb_pending_execute_check_state(ctx->pending_result));
@@ -141,6 +143,9 @@ rubyDuckDBPendingResult *get_struct_pending_result(VALUE obj) {
 }
 
 void rbduckdb_init_duckdb_pending_result(void) {
+#if 0
+    VALUE mDuckDB = rb_define_module("DuckDB");
+#endif
     cDuckDBPendingResult = rb_define_class_under(mDuckDB, "PendingResult", rb_cObject);
     rb_define_alloc_func(cDuckDBPendingResult, allocate);
 

data/ext/duckdb/prepared_statement.c

@@ -102,21 +102,47 @@ static VALUE duckdb_prepared_statement_nparams(VALUE self) {
     return ULL2NUM(duckdb_nparams(ctx->prepared_statement));
 }
 
+/* :nodoc: */
+typedef struct {
+    duckdb_prepared_statement prepared_statement;
+    duckdb_result *out_result;
+    duckdb_state retval;
+} duckdb_prepared_statement_execute_nogvl_args;
+
+/* :nodoc: */
+static void duckdb_prepared_statement_execute_nogvl(void *ptr) {
+    duckdb_prepared_statement_execute_nogvl_args *args = (duckdb_prepared_statement_execute_nogvl_args *)ptr;
+
+    args->retval = duckdb_execute_prepared(args->prepared_statement, args->out_result);
+}
+
 static VALUE duckdb_prepared_statement_execute(VALUE self) {
     rubyDuckDBPreparedStatement *ctx;
     rubyDuckDBResult *ctxr;
+    const char *error;
     VALUE result = rbduckdb_create_result();
-    const char *p = NULL;
 
     TypedData_Get_Struct(self, rubyDuckDBPreparedStatement, &prepared_statement_data_type, ctx);
     ctxr = get_struct_result(result);
-    if (duckdb_execute_prepared(ctx->prepared_statement, &(ctxr->result)) == DuckDBError) {
-        p = duckdb_result_error(&(ctxr->result));
-        if (p == NULL) {
-            p = duckdb_prepare_error(ctx->prepared_statement);
+
+    duckdb_prepared_statement_execute_nogvl_args args = {
+        .prepared_statement = ctx->prepared_statement,
+        .out_result = &(ctxr->result),
+        .retval = DuckDBError,
+    };
+
+    rb_thread_call_without_gvl((void *)duckdb_prepared_statement_execute_nogvl, &args, RUBY_UBF_IO, 0);
+    duckdb_state state = args.retval;
+
+    if (state == DuckDBError) {
+        error = duckdb_result_error(args.out_result);
+        if (error == NULL) {
+            error = duckdb_prepare_error(args.prepared_statement);
         }
-        rb_raise(eDuckDBError, "%s", p ? p : "Failed to execute prepared statement.");
+
+        rb_raise(eDuckDBError, "%s", error ? error : "Failed to execute prepared statement.");
     }
+
     return result;
 }
 
@@ -316,18 +342,21 @@ static VALUE duckdb_prepared_statement_bind_null(VALUE self, VALUE vidx) {
     return self;
 }
 
+/* :nodoc: */
 static VALUE duckdb_prepared_statement__statement_type(VALUE self) {
     rubyDuckDBPreparedStatement *ctx;
     TypedData_Get_Struct(self, rubyDuckDBPreparedStatement, &prepared_statement_data_type, ctx);
     return INT2FIX(duckdb_prepared_statement_type(ctx->prepared_statement));
 }
 
+/* :nodoc: */
 static VALUE duckdb_prepared_statement__param_type(VALUE self, VALUE vidx) {
     rubyDuckDBPreparedStatement *ctx;
     TypedData_Get_Struct(self, rubyDuckDBPreparedStatement, &prepared_statement_data_type, ctx);
     return INT2FIX(duckdb_param_type(ctx->prepared_statement, NUM2ULL(vidx)));
 }
 
+/* :nodoc: */
 static VALUE duckdb_prepared_statement__bind_date(VALUE self, VALUE vidx, VALUE year, VALUE month, VALUE day) {
     rubyDuckDBPreparedStatement *ctx;
     duckdb_date dt;
@@ -344,6 +373,7 @@ static VALUE duckdb_prepared_statement__bind_date(VALUE self, VALUE vidx, VALUE
     return self;
 }
 
+/* :nodoc: */
 static VALUE duckdb_prepared_statement__bind_time(VALUE self, VALUE vidx, VALUE hour, VALUE min, VALUE sec, VALUE micros){
     rubyDuckDBPreparedStatement *ctx;
     duckdb_time time;
@@ -361,6 +391,7 @@ static VALUE duckdb_prepared_statement__bind_time(VALUE self, VALUE vidx, VALUE
     return self;
 }
 
+/* :nodoc: */
 static VALUE duckdb_prepared_statement__bind_timestamp(VALUE self, VALUE vidx, VALUE year, VALUE month, VALUE day, VALUE hour, VALUE min, VALUE sec, VALUE micros) {
     duckdb_timestamp timestamp;
     rubyDuckDBPreparedStatement *ctx;
@@ -375,6 +406,7 @@ static VALUE duckdb_prepared_statement__bind_timestamp(VALUE self, VALUE vidx, V
     return self;
 }
 
+/* :nodoc: */
 static VALUE duckdb_prepared_statement__bind_interval(VALUE self, VALUE vidx, VALUE months, VALUE days, VALUE micros) {
     duckdb_interval interval;
     rubyDuckDBPreparedStatement *ctx;
@@ -390,6 +422,7 @@ static VALUE duckdb_prepared_statement__bind_interval(VALUE self, VALUE vidx, VA
     return self;
 }
 
+/* :nodoc: */
 static VALUE duckdb_prepared_statement__bind_hugeint(VALUE self, VALUE vidx, VALUE lower, VALUE upper) {
     duckdb_hugeint hugeint;
     rubyDuckDBPreparedStatement *ctx;
@@ -406,6 +439,7 @@ static VALUE duckdb_prepared_statement__bind_hugeint(VALUE self, VALUE vidx, VAL
     return self;
 }
 
+/* :nodoc: */
 static VALUE duckdb_prepared_statement__bind_decimal(VALUE self, VALUE vidx, VALUE lower, VALUE upper, VALUE width, VALUE scale) {
     duckdb_hugeint hugeint;
     duckdb_decimal decimal;
@@ -433,6 +467,9 @@ rubyDuckDBPreparedStatement *get_struct_prepared_statement(VALUE self) {
 }
 
 void rbduckdb_init_duckdb_prepared_statement(void) {
+#if 0
+    VALUE mDuckDB = rb_define_module("DuckDB");
+#endif
     cDuckDBPreparedStatement = rb_define_class_under(mDuckDB, "PreparedStatement", rb_cObject);
 
     rb_define_alloc_func(cDuckDBPreparedStatement, allocate);