duckdb 0.6.2-dev1011.0 → 0.6.2-dev1017.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.6.2-dev1011.0",
+  "version": "0.6.2-dev1017.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb/src/catalog/catalog.cpp

@@ -741,7 +741,7 @@ idx_t Catalog::GetCatalogVersion() {
 }
 
 idx_t Catalog::ModifyCatalog() {
-	return GetDatabase().GetDatabaseManager().catalog_version++;
+	return GetDatabase().GetDatabaseManager().ModifyCatalog();
 }
 
 bool Catalog::IsSystemCatalog() const {

package/src/duckdb/src/function/table/version/pragma_version.cpp

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.6.2-dev1011"
+#define DUCKDB_VERSION "0.6.2-dev1017"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "71a27493d2"
+#define DUCKDB_SOURCE_ID "b056090a0c"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

package/src/duckdb/src/include/duckdb/main/database_manager.hpp

@@ -52,6 +52,9 @@ public:
 	transaction_t ActiveQueryNumber() const {
 		return current_query_number;
 	}
+	idx_t ModifyCatalog() {
+		return catalog_version++;
+	}
 
 private:
 	//! The system database is a special database that holds system entries (e.g. functions)

package/src/duckdb/src/main/client_data.cpp

@@ -9,6 +9,7 @@
 #include "duckdb/common/serializer/buffered_file_writer.hpp"
 #include "duckdb/main/attached_database.hpp"
 #include "duckdb/main/database.hpp"
+#include "duckdb/main/database_manager.hpp"
 
 namespace duckdb {
 
@@ -17,6 +18,7 @@ ClientData::ClientData(ClientContext &context) : catalog_search_path(make_unique
 	profiler = make_shared<QueryProfiler>(context);
 	query_profiler_history = make_unique<QueryProfilerHistory>();
 	temporary_objects = make_shared<AttachedDatabase>(db, AttachedDatabaseType::TEMP_DATABASE);
+	temporary_objects->oid = DatabaseManager::Get(db).ModifyCatalog();
 	random_engine = make_unique<RandomEngine>();
 	file_opener = make_unique<ClientContextFileOpener>(context);
 	temporary_objects->Initialize();

package/src/duckdb/src/main/database_manager.cpp

@@ -32,6 +32,7 @@ AttachedDatabase *DatabaseManager::GetDatabase(ClientContext &context, const str
 
 void DatabaseManager::AddDatabase(ClientContext &context, unique_ptr<AttachedDatabase> db_instance) {
 	auto name = db_instance->GetName();
+	db_instance->oid = ModifyCatalog();
 	DependencyList dependencies;
 	if (default_database.empty()) {
 		default_database = name;

package/src/duckdb/src/parser/transform/helpers/transform_typename.cpp

@@ -164,6 +164,27 @@ LogicalType Transformer::TransformTypeName(duckdb_libpgquery::PGTypeName *type_n
 			result_type = LogicalType::USER(user_type_name);
 			break;
 		}
+		case LogicalTypeId::TIMESTAMP:
+			if (modifier_idx == 0) {
+				result_type = LogicalType::TIMESTAMP;
+			} else {
+				if (modifier_idx > 1) {
+					throw ParserException("TIMESTAMP only supports a single modifier");
+				}
+				if (width > 10) {
+					throw ParserException("TIMESTAMP only supports until nano-second precision (9)");
+				}
+				if (width == 0) {
+					result_type = LogicalType::TIMESTAMP_S;
+				} else if (width <= 3) {
+					result_type = LogicalType::TIMESTAMP_MS;
+				} else if (width <= 6) {
+					result_type = LogicalType::TIMESTAMP;
+				} else {
+					result_type = LogicalType::TIMESTAMP_NS;
+				}
+			}
+			break;
 		default:
 			if (modifier_idx > 0) {
 				throw ParserException("Type %s does not support any modifiers!", LogicalType(base_type).ToString());