Merge pull request duckdb#108 from samansmink/prepare-for-v1.2.0

Prepare for v1.2.0

Author: Mytherin

.github/workflows/MainDistributionPipeline.yml

@@ -17,9 +17,9 @@ jobs:
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
       extension_name: mysql_scanner
-      duckdb_version: v1.1.3
-      ci_tools_version: v1.1.3
-      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
+      duckdb_version: main
+      ci_tools_version: main
+      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw;linux_amd64_musl'
       build_duckdb_shell: false
 
   duckdb-stable-deploy:
@@ -28,8 +28,8 @@ jobs:
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
-      duckdb_version: v1.1.3
-      ci_tools_version: v1.1.3
+      duckdb_version: main
+      ci_tools_version: main
       extension_name: mysql_scanner
-      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
+      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw;linux_amd64_musl'
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}

.github/workflows/MysqlTests.yml

@@ -59,7 +59,7 @@ jobs:
       - name: Setup vcpkg
         uses: lukka/[email protected]
         with:
-          vcpkgGitCommitId: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6
+          vcpkgGitCommitId: 5e5d0e1cd7785623065e77eff011afdeec1a3574
 
       - name: Setup MySQL
         if: ${{ matrix.osx_build_arch == 'x86_64'}}

duckdb

@@ -158,9 +158,11 @@ static void MySQLScan(ClientContext &context, TableFunctionInput &data, DataChun
 	output.SetCardinality(r);
 }
 
-static string MySQLScanToString(const FunctionData *bind_data_p) {
-	auto &bind_data = bind_data_p->Cast<MySQLBindData>();
-	return bind_data.table.name;
+static InsertionOrderPreservingMap<string> MySQLScanToString(TableFunctionToStringInput &input) {
+	InsertionOrderPreservingMap<string> result;
+	auto &bind_data = input.bind_data->Cast<MySQLBindData>();
+	result["Table"] = bind_data.table.name;
+	return result;
 }
 
 static void MySQLScanSerialize(Serializer &serializer, const optional_ptr<FunctionData> bind_data_p,

extension-ci-tools

@@ -139,7 +139,9 @@ MySQLConnectionParameters MySQLUtils::ParseConnectionParameters(const string &ds
 			} else if (val == "preferred") {
 				result.ssl_mode = SSL_MODE_PREFERRED;
 			} else {
-				throw InvalidInputException("Invalid dsn - ssl mode must be either disabled, required, verify_ca, verify_identity or preferred - got %s", value);
+				throw InvalidInputException("Invalid dsn - ssl mode must be either disabled, required, verify_ca, "
+				                            "verify_identity or preferred - got %s",
+				                            value);
 			}
 		} else if (key == "ssl_ca") {
 			set_options.insert("ssl_ca");

src/mysql_scanner.cpp

@@ -92,6 +92,20 @@ string ExtractFilters(PhysicalOperator &child, const string &statement) {
 		} else {
 			return result + " AND " + filter_str;
 		}
+	} else if (child.type == PhysicalOperatorType::PROJECTION) {
+		auto &proj = child.Cast<PhysicalProjection>();
+		for (auto &expr : proj.select_list) {
+			switch (expr->type) {
+			case ExpressionType::BOUND_REF:
+			case ExpressionType::BOUND_COLUMN_REF:
+			case ExpressionType::VALUE_CONSTANT:
+				break;
+			default:
+				throw NotImplementedException("Unsupported expression type in projection - only simple deletes/updates "
+				                              "are supported in the MySQL connector");
+			}
+		}
+		return ExtractFilters(*child.children[0], statement);
 	} else if (child.type == PhysicalOperatorType::TABLE_SCAN) {
 		auto &table_scan = child.Cast<PhysicalTableScan>();
 		if (!table_scan.table_filters) {

src/mysql_utils.cpp

@@ -6,7 +6,5 @@
     "overlay-ports": [
       "./vcpkg_ports"
     ]
-  },
-  "builtin-baseline": "a42af01b72c28a8e1d7b48107b33e4f286a55ef6",
-  "overrides": [{"name": "openssl", "version": "3.0.8"}]
+  }
 }