duckdb 0.3.2-dev710.0 → 0.3.2-dev739.0

package/binding.gyp

@@ -8,6 +8,7 @@
                 "src/connection.cpp",
                 "src/statement.cpp",
                 "src/utils.cpp",
+                "src/parquet-amalgamation.cpp",
                 "src/duckdb.cpp" # comment this out to build against existing lib
             ],
             "include_dirs": [

package/configure

@@ -6,12 +6,9 @@ set -x
 cd `dirname $0`
 
 if [ ! -f "../../scripts/amalgamation.py" ]; then
-	echo "Could find neither the amalgamation build script"
+	echo "Could not find the amalgamation build script"
 	exit 1
 fi
 
-(cd ../.. && python scripts/amalgamation.py --source=tools/nodejs/src/duckdb.cpp --header=tools/nodejs/src/duckdb.hpp)
-# (cd ../.. && python extension/parquet/parquet_amalgamation.py --source=tools/rpkg/src/parquet-extension.cpp --header=tools/rpkg/src/parquet-extension.h)
-# cp src/parquet-extension.h src/parquet-extension.h.tmp
-# sed 's/duckdb[.]hpp/duckdb.h/g' src/parquet-extension.h.tmp > src/parquet-extension.h
-# rm src/parquet-extension.h.tmp
+(cd ../.. && python scripts/amalgamation.py --extended --source=tools/nodejs/src/duckdb.cpp --header=tools/nodejs/src/duckdb.hpp)
+(cd ../.. && python scripts/parquet_amalgamation.py && cp src/amalgamation/parquet-amalgamation* tools/nodejs/src/)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.3.2-dev710.0",
+  "version": "0.3.2-dev739.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/database.cpp

@@ -1,4 +1,5 @@
 #include "duckdb_node.hpp"
+#include "parquet-amalgamation.hpp"
 
 namespace node_duckdb {
 
@@ -28,6 +29,8 @@ struct OpenTask : public Task {
 	void DoWork() override {
 		try {
 			Get<Database>().database = duckdb::make_unique<duckdb::DuckDB>(filename);
+			duckdb::ParquetExtension extension;
+			extension.Load(*Get<Database>().database);
 			success = true;
 
 		} catch (std::exception &ex) {