duckdb 0.3.5-dev1353.0 → 0.3.5-dev1360.0

package/package.json

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

package/src/duckdb.cpp

@@ -115880,6 +115880,7 @@ string ClientContext::VerifyQuery(ClientContextLock &lock, const string &query,
 		} catch (std::exception &ex) {
 			results.push_back(make_unique<MaterializedQueryResult>(ex.what()));
 		}
+		interrupted = false;
 	}
 	config.enable_optimizer = optimizer_enabled;
 
@@ -115890,6 +115891,7 @@ string ClientContext::VerifyQuery(ClientContextLock &lock, const string &query,
 		try {
 			RunStatementInternal(lock, explain_q, move(explain_stmt), false, false);
 		} catch (std::exception &ex) { // LCOV_EXCL_START
+			interrupted = false;
 			return "EXPLAIN failed but query did not (" + string(ex.what()) + ")";
 		} // LCOV_EXCL_STOP
 	}
@@ -156967,7 +156969,28 @@ unique_ptr<Constraint> Transformer::TransformConstraint(duckdb_libpgquery::PGLis
 			                      "dictionary, pfor, bitpacking or fsst");
 		}
 		return nullptr;
-	case duckdb_libpgquery::PG_CONSTR_FOREIGN:
+	case duckdb_libpgquery::PG_CONSTR_FOREIGN: {
+		ForeignKeyInfo fk_info;
+		fk_info.type = ForeignKeyType::FK_TYPE_FOREIGN_KEY_TABLE;
+		if (constraint->pktable->schemaname) {
+			fk_info.schema = constraint->pktable->schemaname;
+		} else {
+			fk_info.schema = "";
+		}
+		fk_info.table = constraint->pktable->relname;
+		vector<string> pk_columns, fk_columns;
+
+		fk_columns.emplace_back(column.Name().c_str());
+		if (constraint->pk_attrs) {
+			for (auto kc = constraint->pk_attrs->head; kc; kc = kc->next) {
+				pk_columns.emplace_back(reinterpret_cast<duckdb_libpgquery::PGValue *>(kc->data.ptr_value)->val.str);
+			}
+		}
+		if (pk_columns.size() != fk_columns.size()) {
+			throw ParserException("The number of referencing and referenced columns for foreign keys must be the same");
+		}
+		return make_unique<ForeignKeyConstraint>(pk_columns, fk_columns, move(fk_info));
+	}
 	default:
 		throw NotImplementedException("Constraint not implemented!");
 	}
@@ -160278,6 +160301,11 @@ unique_ptr<CreateStatement> Transformer::TransformCreateTable(duckdb_libpgquery:
 			throw NotImplementedException("ColumnDef type not handled yet");
 		}
 	}
+
+	if (!column_count) {
+		throw ParserException("Table must have at least one column!");
+	}
+
 	result->info = move(info);
 	return result;
 }
@@ -174709,8 +174737,8 @@ unique_ptr<BufferHandle> BufferManager::Pin(shared_ptr<BlockHandle> &handle) {
 void BufferManager::AddToEvictionQueue(shared_ptr<BlockHandle> &handle) {
 	D_ASSERT(handle->readers == 0);
 	handle->eviction_timestamp++;
+	PurgeQueue();
 	queue->q.enqueue(make_unique<BufferEvictionNode>(weak_ptr<BlockHandle>(handle), handle->eviction_timestamp));
-	// FIXME: do some house-keeping to prevent the queue from being flooded with many old blocks
 }
 
 void BufferManager::Unpin(shared_ptr<BlockHandle> &handle) {

package/src/duckdb.hpp

@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #pragma once
 #define DUCKDB_AMALGAMATION 1
 #define DUCKDB_AMALGAMATION_EXTENDED 1
-#define DUCKDB_SOURCE_ID "60865b7a0"
-#define DUCKDB_VERSION "v0.3.5-dev1353"
+#define DUCKDB_SOURCE_ID "dc74756a0"
+#define DUCKDB_VERSION "v0.3.5-dev1360"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //