duckdb 0.5.1 → 0.5.2-dev16.0

package/package.json

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

package/src/duckdb.cpp

@@ -43588,12 +43588,16 @@ hash_t Hash(hugeint_t val) {
 
 template <>
 hash_t Hash(float val) {
-	return std::hash<float> {}(val);
+	static_assert(sizeof(float) == sizeof(uint32_t), "");
+	uint32_t uval = *((uint32_t *)&val);
+	return murmurhash64(uval);
 }
 
 template <>
 hash_t Hash(double val) {
-	return std::hash<double> {}(val);
+	static_assert(sizeof(double) == sizeof(uint64_t), "");
+	uint64_t uval = *((uint64_t *)&val);
+	return murmurhash64(uval);
 }
 
 template <>
@@ -120916,6 +120920,13 @@ static void PragmaStorageInfoFunction(ClientContext &context, TableFunctionInput
 	auto &bind_data = (PragmaStorageFunctionData &)*data_p.bind_data;
 	auto &data = (PragmaStorageOperatorData &)*data_p.global_state;
 	idx_t count = 0;
+	map<storage_t, column_t> soid_to_idx;
+	for (idx_t cidx = 0; cidx < bind_data.table_entry->columns.size(); cidx++) {
+		auto &entry = bind_data.table_entry->columns[cidx];
+		if (!entry.Generated()) {
+			soid_to_idx[entry.StorageOid()] = entry.Oid();
+		}
+	}
 	while (data.offset < bind_data.storage_info.size() && count < STANDARD_VECTOR_SIZE) {
 		auto &entry = bind_data.storage_info[data.offset++];
 		D_ASSERT(entry.size() + 1 == output.ColumnCount());
@@ -120923,8 +120934,9 @@ static void PragmaStorageInfoFunction(ClientContext &context, TableFunctionInput
 		for (idx_t col_idx = 0; col_idx < entry.size(); col_idx++, result_idx++) {
 			if (col_idx == 1) {
 				// write the column name
-				auto column_index = entry[col_idx].GetValue<int64_t>();
-				output.SetValue(result_idx, count, Value(bind_data.table_entry->columns[column_index].Name()));
+				auto storage_column_index = entry[col_idx].GetValue<int64_t>();
+				output.SetValue(result_idx, count,
+				                Value(bind_data.table_entry->columns[soid_to_idx[storage_column_index]].Name()));
 				result_idx++;
 			}
 			output.SetValue(result_idx, count, entry[col_idx]);
@@ -197917,8 +197929,9 @@ void DataTable::VerifyAppendConstraints(TableCatalogEntry &table, ClientContext
 		auto &constraint = table.bound_constraints[i];
 		switch (base_constraint->type) {
 		case ConstraintType::NOT_NULL: {
-			auto &not_null = *reinterpret_cast<BoundNotNullConstraint *>(constraint.get());
-			VerifyNotNullConstraint(table, chunk.data[not_null.index], chunk.size(),
+			auto &bound_not_null = *reinterpret_cast<BoundNotNullConstraint *>(constraint.get());
+			auto &not_null = *reinterpret_cast<NotNullConstraint *>(base_constraint.get());
+			VerifyNotNullConstraint(table, chunk.data[bound_not_null.index], chunk.size(),
 			                        table.columns[not_null.index].Name());
 			break;
 		}
@@ -198389,13 +198402,16 @@ static bool CreateMockChunk(TableCatalogEntry &table, const vector<column_t> &co
 
 void DataTable::VerifyUpdateConstraints(TableCatalogEntry &table, DataChunk &chunk,
                                         const vector<column_t> &column_ids) {
-	for (auto &constraint : table.bound_constraints) {
+	for (idx_t i = 0; i < table.bound_constraints.size(); i++) {
+		auto &base_constraint = table.constraints[i];
+		auto &constraint = table.bound_constraints[i];
 		switch (constraint->type) {
 		case ConstraintType::NOT_NULL: {
-			auto &not_null = *reinterpret_cast<BoundNotNullConstraint *>(constraint.get());
+			auto &bound_not_null = *reinterpret_cast<BoundNotNullConstraint *>(constraint.get());
+			auto &not_null = *reinterpret_cast<NotNullConstraint *>(base_constraint.get());
 			// check if the constraint is in the list of column_ids
 			for (idx_t i = 0; i < column_ids.size(); i++) {
-				if (column_ids[i] == not_null.index) {
+				if (column_ids[i] == bound_not_null.index) {
 					// found the column id: check the data in
 					VerifyNotNullConstraint(table, chunk.data[i], chunk.size(), table.columns[not_null.index].Name());
 					break;

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 "7c111322d"
-#define DUCKDB_VERSION "v0.5.1"
+#define DUCKDB_SOURCE_ID "d41a2e811"
+#define DUCKDB_VERSION "v0.5.2-dev16"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //