Upgrade to DuckDB v2.0.0

.github/workflows/MainDistributionPipeline.yml

@@ -14,17 +14,17 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.5-variegata
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v2.0-cyanoptera
     with:
-      duckdb_version: v1.5.6
-      ci_tools_version: v1.5-variegata
+      duckdb_version: v2.0.0
+      ci_tools_version: v2.0-cyanoptera
       extension_name: duck_diff
 
   code-quality-check:
     name: Code Quality Check
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_code_quality.yml@v1.5-variegata
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_code_quality.yml@v2.0-cyanoptera
     with:
-      duckdb_version: v1.5.6
-      ci_tools_version: v1.5-variegata
+      duckdb_version: v2.0.0
+      ci_tools_version: v2.0-cyanoptera
       extension_name: duck_diff
       format_checks: 'format;tidy'

.github/workflows/Release.yml

@@ -18,16 +18,16 @@ permissions:
   contents: write
 
 env:
-  DUCKDB_VERSION: v1.5.6
+  DUCKDB_VERSION: v2.0.0
   EXTENSION_NAME: duck_diff
 
 jobs:
   build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.5-variegata
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v2.0-cyanoptera
     with:
-      duckdb_version: v1.5.6
-      ci_tools_version: v1.5-variegata
+      duckdb_version: v2.0.0
+      ci_tools_version: v2.0-cyanoptera
       extension_name: duck_diff
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads'
 

RELEASE_NOTES.md

@@ -70,6 +70,6 @@ Also included:
 
 ### Housekeeping
 
-- Upgraded the bundled DuckDB to v1.5.6.
+- Upgraded the bundled DuckDB to v2.0.0 (extension-ci-tools `v2.0-cyanoptera`).
 - `duck_diff` is now installable from the DuckDB community extension
   repository: `INSTALL duck_diff FROM community;`

src/duck_diff_extension.cpp

@@ -85,7 +85,7 @@ RelationSchema InspectRelation(ClientContext &context, optional_ptr<Binder> pare
 	// The argument is a query, written as the caller would in SQL: a `FROM …`
 	// clause or a full `SELECT … FROM …`. (A bare relation name is not a
 	// statement and is rejected — write `FROM tbl`.)
-	Parser parser(context.GetParserOptions());
+	Parser parser(context);
 	try {
 		parser.ParseQuery(relation);
 	} catch (const std::exception &e) {
@@ -102,7 +102,9 @@ RelationSchema InspectRelation(ClientContext &context, optional_ptr<Binder> pare
 	RelationSchema schema;
 	try {
 		auto bound = binder->Bind(*parser.statements[0]);
-		schema.names = bound.names;
+		for (auto &name : bound.names) {
+			schema.names.push_back(name.GetIdentifierName());
+		}
 		schema.types = bound.types;
 	} catch (const std::exception &e) {
 		throw BinderException("table_diff: could not resolve the %s relation (%s): %s", side, relation, e.what());
@@ -147,7 +149,7 @@ struct DiffPlan {
 
 // Look up a named parameter, returning nullptr if absent.
 const Value *FindParam(TableFunctionBindInput &input, const string &name) {
-	auto it = input.named_parameters.find(name);
+	auto it = input.named_parameters.find(Identifier(name));
 	if (it == input.named_parameters.end() || it->second.IsNull()) {
 		return nullptr;
 	}
@@ -567,7 +569,7 @@ string BuildDiffSQL(const DiffPlan &plan, const string &status_col, const string
 }
 
 unique_ptr<TableRef> ParseSubquery(ClientContext &context, const string &sql) {
-	Parser parser(context.GetParserOptions());
+	Parser parser(context);
 	parser.ParseQuery(sql);
 	if (parser.statements.size() != 1 || parser.statements[0]->type != StatementType::SELECT_STATEMENT) {
 		throw InternalException("table_diff: generated query was not a single SELECT statement");
@@ -704,16 +706,18 @@ unique_ptr<TableRef> SchemaDiffBindReplace(ClientContext &context, TableFunction
 //===--------------------------------------------------------------------===//
 
 void AddDiffParameters(TableFunction &fun) {
-	fun.named_parameters["pk"] = LogicalType::ANY; // string or list
-	fun.named_parameters["require_matching_columns"] = LogicalType::BOOLEAN;
-	fun.named_parameters["upcast_types"] = LogicalType::BOOLEAN;
-	fun.named_parameters["columns"] = LogicalType::LIST(LogicalType::VARCHAR);
-	fun.named_parameters["ignore"] = LogicalType::LIST(LogicalType::VARCHAR);
-	fun.named_parameters["numeric_tolerance"] = LogicalType::DOUBLE;
-	fun.named_parameters["timestamp_precision"] = LogicalType::VARCHAR;
-	fun.named_parameters["null_equals_empty"] = LogicalType::BOOLEAN;
-	fun.named_parameters["prefix"] = LogicalType::VARCHAR;
-	fun.named_parameters["context"] = LogicalType::LIST(LogicalType::VARCHAR);
+	// All optional: a NULL default reads as "not passed" (see FindParam).
+	auto &sig = fun.GetSignature();
+	sig.AddKeywordOnly("pk", LogicalType::ANY, Value()); // string or list
+	sig.AddKeywordOnly("require_matching_columns", LogicalType::BOOLEAN, Value());
+	sig.AddKeywordOnly("upcast_types", LogicalType::BOOLEAN, Value());
+	sig.AddKeywordOnly("columns", LogicalType::LIST(LogicalType::VARCHAR), Value());
+	sig.AddKeywordOnly("ignore", LogicalType::LIST(LogicalType::VARCHAR), Value());
+	sig.AddKeywordOnly("numeric_tolerance", LogicalType::DOUBLE, Value());
+	sig.AddKeywordOnly("timestamp_precision", LogicalType::VARCHAR, Value());
+	sig.AddKeywordOnly("null_equals_empty", LogicalType::BOOLEAN, Value());
+	sig.AddKeywordOnly("prefix", LogicalType::VARCHAR, Value());
+	sig.AddKeywordOnly("context", LogicalType::LIST(LogicalType::VARCHAR), Value());
 }
 
 void LoadInternal(ExtensionLoader &loader) {