duckdb 1.5.2.0 → 1.5.3.0

data/ext/duckdb/extconf.rb

@@ -4,13 +4,34 @@ require 'mkmf'
 
 DUCKDB_REQUIRED_VERSION = '1.4.0'
 
+def brew_prefix(formula = nil)
+  cmd = formula ? "brew --prefix #{formula} 2>/dev/null" : 'brew --prefix 2>/dev/null'
+  prefix = `#{cmd}`.chomp
+  prefix.empty? ? nil : prefix
+end
+
+FALLBACK_PREFIXES = %w[/opt/homebrew /opt/homebrew/opt/duckdb /opt/local].freeze
+
+def brew_dirs(subdir)
+  dirs = []
+  dirs << "#{brew_prefix('duckdb')}/#{subdir}" if brew_prefix('duckdb')
+  if (prefix = brew_prefix)
+    dirs << "#{prefix}/#{subdir}"
+    dirs << "#{prefix}/opt/duckdb/#{subdir}"
+  end
+  dirs
+end
+
+def homebrew_include_dirs
+  (brew_dirs('include') + FALLBACK_PREFIXES.map { |p| "#{p}/include" }).uniq
+end
+
+def homebrew_lib_dirs
+  (brew_dirs('lib') + FALLBACK_PREFIXES.map { |p| "#{p}/lib" }).uniq
+end
+
 def check_duckdb_header(header, version)
-  found = find_header(
-    header,
-    '/opt/homebrew/include',
-    '/opt/homebrew/opt/duckdb/include',
-    '/opt/local/include'
-  )
+  found = find_header(header, *homebrew_include_dirs)
   return if found
 
   msg = "#{header} is not found. Install #{header} of duckdb >= #{version}."
@@ -19,13 +40,7 @@ def check_duckdb_header(header, version)
 end
 
 def check_duckdb_library(library, func, version)
-  found = find_library(
-    library,
-    func,
-    '/opt/homebrew/lib',
-    '/opt/homebrew/opt/duckdb/lib',
-    '/opt/local/lib'
-  )
+  found = find_library(library, func, *homebrew_lib_dirs)
   have_func(func, 'duckdb.h')
   return if found
 
@@ -58,9 +73,10 @@ dir_config('duckdb')
 check_duckdb_header('duckdb.h', DUCKDB_REQUIRED_VERSION)
 check_duckdb_library('duckdb', 'duckdb_appender_create_query', DUCKDB_REQUIRED_VERSION)
 
-# check duckdb >= 1.4.0
-have_func('duckdb_appender_create_query', 'duckdb.h')
-
+# check duckdb >= 1.5.0
 have_func('duckdb_unsafe_vector_assign_string_element_len', 'duckdb.h')
 
+# check duckdb >= 1.5.2
+have_func('duckdb_geometry_type_get_crs', 'duckdb.h')
+
 create_makefile('duckdb/duckdb_native')

data/ext/duckdb/extracted_statements.c

@@ -16,10 +16,10 @@ static void deallocate(void *ctx);
 static VALUE allocate(VALUE klass);
 static size_t memsize(const void *p);
 
-static VALUE duckdb_extracted_statements__initialize(VALUE self, VALUE con, VALUE query);
-static VALUE duckdb_extracted_statements_destroy(VALUE self);
-static VALUE duckdb_extracted_statements_size(VALUE self);
-static VALUE duckdb_extracted_statements_prepared_statement(VALUE self, VALUE con, VALUE index);
+static VALUE extracted_statements__initialize(VALUE self, VALUE con, VALUE query);
+static VALUE extracted_statements_destroy(VALUE self);
+static VALUE extracted_statements_size(VALUE self);
+static VALUE extracted_statements_prepared_statement(VALUE self, VALUE con, VALUE index);
 
 static void deallocate(void *ctx) {
     rubyDuckDBExtractedStatements *p = (rubyDuckDBExtractedStatements *)ctx;
@@ -39,7 +39,7 @@ static size_t memsize(const void *p) {
     return sizeof(rubyDuckDBExtractedStatements);
 }
 
-static VALUE duckdb_extracted_statements__initialize(VALUE self, VALUE con, VALUE query) {
+static VALUE extracted_statements__initialize(VALUE self, VALUE con, VALUE query) {
     rubyDuckDBConnection *pcon;
     rubyDuckDBExtractedStatements *ctx;
     char *pquery;
@@ -50,7 +50,7 @@ static VALUE duckdb_extracted_statements__initialize(VALUE self, VALUE con, VALU
     }
 
     pquery = StringValuePtr(query);
-    pcon = get_struct_connection(con);
+    pcon = rbduckdb_get_struct_connection(con);
     TypedData_Get_Struct(self, rubyDuckDBExtractedStatements, &extract_statements_data_type, ctx);
 
     ctx->num_statements = duckdb_extract_statements(pcon->con, pquery, &(ctx->extracted_statements));
@@ -63,7 +63,7 @@ static VALUE duckdb_extracted_statements__initialize(VALUE self, VALUE con, VALU
     return self;
 }
 
-static VALUE duckdb_extracted_statements_destroy(VALUE self) {
+static VALUE extracted_statements_destroy(VALUE self) {
     rubyDuckDBExtractedStatements *ctx;
 
     TypedData_Get_Struct(self, rubyDuckDBExtractedStatements, &extract_statements_data_type, ctx);
@@ -73,7 +73,7 @@ static VALUE duckdb_extracted_statements_destroy(VALUE self) {
     return Qnil;
 }
 
-static VALUE duckdb_extracted_statements_size(VALUE self) {
+static VALUE extracted_statements_size(VALUE self) {
     rubyDuckDBExtractedStatements *ctx;
 
     TypedData_Get_Struct(self, rubyDuckDBExtractedStatements, &extract_statements_data_type, ctx);
@@ -81,28 +81,28 @@ static VALUE duckdb_extracted_statements_size(VALUE self) {
     return ULL2NUM(ctx->num_statements);
 }
 
-static VALUE duckdb_extracted_statements_prepared_statement(VALUE self, VALUE con, VALUE index) {
+static VALUE extracted_statements_prepared_statement(VALUE self, VALUE con, VALUE index) {
     rubyDuckDBConnection *pcon;
     rubyDuckDBExtractedStatements *ctx;
 
     if (rb_obj_is_kind_of(con, cDuckDBConnection) != Qtrue) {
         rb_raise(rb_eTypeError, "1st argument must be DuckDB::Connection");
     }
-    pcon = get_struct_connection(con);
+    pcon = rbduckdb_get_struct_connection(con);
     TypedData_Get_Struct(self, rubyDuckDBExtractedStatements, &extract_statements_data_type, ctx);
 
     return rbduckdb_prepared_statement_new(pcon->con, ctx->extracted_statements, NUM2ULL(index));
 }
 
-void rbduckdb_init_duckdb_extracted_statements(void) {
+void rbduckdb_init_extracted_statements(void) {
 #if 0
     VALUE mDuckDB = rb_define_module("DuckDB");
 #endif
     cDuckDBExtractedStatements = rb_define_class_under(mDuckDB, "ExtractedStatements", rb_cObject);
 
     rb_define_alloc_func(cDuckDBExtractedStatements, allocate);
-    rb_define_private_method(cDuckDBExtractedStatements, "_initialize", duckdb_extracted_statements__initialize, 2);
-    rb_define_method(cDuckDBExtractedStatements, "destroy", duckdb_extracted_statements_destroy, 0);
-    rb_define_method(cDuckDBExtractedStatements, "size", duckdb_extracted_statements_size, 0);
-    rb_define_method(cDuckDBExtractedStatements, "prepared_statement", duckdb_extracted_statements_prepared_statement, 2);
+    rb_define_private_method(cDuckDBExtractedStatements, "_initialize", extracted_statements__initialize, 2);
+    rb_define_method(cDuckDBExtractedStatements, "destroy", extracted_statements_destroy, 0);
+    rb_define_method(cDuckDBExtractedStatements, "size", extracted_statements_size, 0);
+    rb_define_method(cDuckDBExtractedStatements, "prepared_statement", extracted_statements_prepared_statement, 2);
 }

data/ext/duckdb/extracted_statements.h

@@ -8,5 +8,5 @@ struct _rubyDuckDBExtractedStatements {
 
 typedef struct _rubyDuckDBExtractedStatements rubyDuckDBExtractedStatements;
 
-void rbduckdb_init_duckdb_extracted_statements(void);
+void rbduckdb_init_extracted_statements(void);
 #endif

data/ext/duckdb/instance_cache.c

@@ -5,9 +5,9 @@ VALUE cDuckDBInstanceCache;
 static void deallocate(void * ctx);
 static VALUE allocate(VALUE klass);
 static size_t memsize(const void *p);
-static VALUE duckdb_instance_cache_initialize(VALUE self);
-static VALUE duckdb_instance_cache_get_or_create(int argc, VALUE *argv, VALUE self);
-static VALUE duckdb_instance_cache_destroy(VALUE self);
+static VALUE instance_cache_initialize(VALUE self);
+static VALUE instance_cache_get_or_create(int argc, VALUE *argv, VALUE self);
+static VALUE instance_cache_destroy(VALUE self);
 
 static const rb_data_type_t instance_cache_data_type = {
     "DuckDB/InstanceCache",
@@ -33,7 +33,7 @@ static VALUE allocate(VALUE klass) {
     return TypedData_Wrap_Struct(klass, &instance_cache_data_type, ctx);
 }
 
-static VALUE duckdb_instance_cache_initialize(VALUE self) {
+static VALUE instance_cache_initialize(VALUE self) {
     rubyDuckDBInstanceCache *ctx;
 
     TypedData_Get_Struct(self, rubyDuckDBInstanceCache, &instance_cache_data_type, ctx);
@@ -47,7 +47,7 @@ static VALUE duckdb_instance_cache_initialize(VALUE self) {
 }
 
 /* :nodoc: */
-static VALUE duckdb_instance_cache_get_or_create(int argc, VALUE *argv, VALUE self) {
+static VALUE instance_cache_get_or_create(int argc, VALUE *argv, VALUE self) {
     VALUE vpath = Qnil;
     VALUE vconfig = Qnil;
     const char *path = NULL;
@@ -82,7 +82,7 @@ static VALUE duckdb_instance_cache_get_or_create(int argc, VALUE *argv, VALUE se
     return rbduckdb_create_database_obj(db);
 }
 
-static VALUE duckdb_instance_cache_destroy(VALUE self) {
+static VALUE instance_cache_destroy(VALUE self) {
     rubyDuckDBInstanceCache *ctx;
     TypedData_Get_Struct(self, rubyDuckDBInstanceCache, &instance_cache_data_type, ctx);
 
@@ -94,13 +94,13 @@ static VALUE duckdb_instance_cache_destroy(VALUE self) {
     return Qnil;
 }
 
-void rbduckdb_init_duckdb_instance_cache(void) {
+void rbduckdb_init_instance_cache(void) {
 #if 0
     VALUE mDuckDB = rb_define_module("DuckDB");
 #endif
     cDuckDBInstanceCache = rb_define_class_under(mDuckDB, "InstanceCache", rb_cObject);
-    rb_define_method(cDuckDBInstanceCache, "initialize", duckdb_instance_cache_initialize, 0);
-    rb_define_method(cDuckDBInstanceCache, "get_or_create", duckdb_instance_cache_get_or_create, -1);
-    rb_define_method(cDuckDBInstanceCache, "destroy", duckdb_instance_cache_destroy, 0);
+    rb_define_method(cDuckDBInstanceCache, "initialize", instance_cache_initialize, 0);
+    rb_define_method(cDuckDBInstanceCache, "get_or_create", instance_cache_get_or_create, -1);
+    rb_define_method(cDuckDBInstanceCache, "destroy", instance_cache_destroy, 0);
     rb_define_alloc_func(cDuckDBInstanceCache, allocate);
 }

data/ext/duckdb/instance_cache.h

@@ -7,6 +7,6 @@ struct _rubyDuckDBInstanceCache {
 
 typedef struct _rubyDuckDBInstanceCache rubyDuckDBInstanceCache;
 
-void rbduckdb_init_duckdb_instance_cache(void);
+void rbduckdb_init_instance_cache(void);
 
 #endif