ext/duckdb/database.c in duckdb-0.2.7.0 vs ext/duckdb/database.c in duckdb-0.2.8.0

@@ -1,9 +1,15 @@
 #include "ruby-duckdb.h"
 
 VALUE cDuckDBDatabase;
 
+static void close_database(rubyDuckDB *p);
+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 void close_database(rubyDuckDB *p)
 {
     duckdb_close(&(p->db));
 }
 
@@ -23,10 +29,11 @@
 
 static VALUE duckdb_database_s_open(int argc, VALUE *argv, VALUE cDuckDBDatabase)
 {
     rubyDuckDB *ctx;
     VALUE obj;
+
     char *pfile = NULL;
     VALUE file = Qnil;
 
     rb_scan_args(argc, argv, "01", &file);
 
@@ -34,17 +41,53 @@
         pfile = StringValuePtr(file);
     }
 
     obj = allocate(cDuckDBDatabase);
     Data_Get_Struct(obj, rubyDuckDB, ctx);
-    if (duckdb_open(pfile, &(ctx->db)) == DuckDBError)
-    {
+    if (duckdb_open(pfile, &(ctx->db)) == DuckDBError) {
         rb_raise(eDuckDBError, "Failed to open database"); /* FIXME */
     }
     return obj;
 }
 
+#ifdef HAVE_DUCKDB_OPEN_EXT
+static VALUE duckdb_database_s_open_ext(int argc, VALUE *argv, VALUE cDuckDBDatabase)
+{
+    rubyDuckDB *ctx;
+    VALUE obj;
+    rubyDuckDBConfig *ctx_config;
+    char *perror;
+
+    char *pfile = NULL;
+    VALUE file = Qnil;
+    VALUE config = Qnil;
+
+    rb_scan_args(argc, argv, "02", &file, &config);
+
+    if (!NIL_P(file)) {
+        pfile = StringValuePtr(file);
+    }
+
+    obj = allocate(cDuckDBDatabase);
+    Data_Get_Struct(obj, rubyDuckDB, ctx);
+    if (!NIL_P(config)) {
+        if (!rb_obj_is_kind_of(config, cDuckDBConfig)) {
+            rb_raise(rb_eTypeError, "The second argument must be DuckDB::Config object.");
+        }
+        Data_Get_Struct(config, rubyDuckDBConfig, ctx_config);
+        if (duckdb_open_ext(pfile, &(ctx->db), ctx_config->config, &perror) == DuckDBError) {
+            rb_raise(eDuckDBError, "Failed to open database %s", perror);
+        }
+    } else {
+        if (duckdb_open(pfile, &(ctx->db)) == DuckDBError) {
+            rb_raise(eDuckDBError, "Failed to open database"); /* FIXME */
+        }
+    }
+    return obj;
+}
+#endif /* HAVE_DUCKDB_OPEN_EXT */
+
 static VALUE duckdb_database_connect(VALUE self)
 {
     return create_connection(self);
 }
 
@@ -65,8 +108,11 @@
 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);
+#ifdef HAVE_DUCKDB_OPEN_EXT
+    rb_define_singleton_method(cDuckDBDatabase, "_open_ext", duckdb_database_s_open_ext, -1);
+#endif
     rb_define_private_method(cDuckDBDatabase, "_connect", duckdb_database_connect, 0);
     rb_define_method(cDuckDBDatabase, "close", duckdb_database_close, 0);
 }