Merge pull request #67 from carlopi/absorb_patches

Mytherin · web-flow · commit 3308c9a2bb3d · 2024-05-13T15:31:25.000+02:00
Absorb patches, move to duckdb's main
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -17,26 +17,17 @@ jobs:
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
       extension_name: mysql_scanner
-      duckdb_version: 'v0.10.2'
-      exclude_archs: 'osx_amd64;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
+      duckdb_version: main
+      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
       build_duckdb_shell: false
 
-  # Note: this workaround is required for building MacOS where extra toolchain config is required
-  duckdb-stable-build-macos:
-    name: Build extension binaries
-    uses: ./.github/workflows/_extension_distribution_macos.yml
-    with:
-      duckdb_version: v0.10.2
-      extension_name: mysql_scanner
-
-
   duckdb-stable-deploy:
     name: Deploy extension binaries
-    needs: [duckdb-stable-build, duckdb-stable-build-macos]
+    needs: duckdb-stable-build
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
-      duckdb_version: v0.10.2
+      duckdb_version: main
       extension_name: mysql_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
diff --git a/.github/workflows/MysqlTests.yml b/.github/workflows/MysqlTests.yml
@@ -54,7 +54,7 @@ jobs:
 
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.7'
+          python-version: '3.11'
 
       - name: Setup vcpkg
         uses: lukka/run-vcpkg@v11.1
@@ -70,9 +70,6 @@ jobs:
       - name: Build extension
         shell: bash
         run: |
-          # needed for MySQL cross compilation - see https://mariadb.com/kb/en/cross-compiling-mariadb/
-          echo 'SET(STACK_DIRECTION -1)' >> ${VCPKG_TOOLCHAIN_PATH}
-          echo 'SET(HAVE_IB_GCC_ATOMIC_BUILTINS 0)' >> ${VCPKG_TOOLCHAIN_PATH}
           make release
 
       - name: Test Extension
diff --git a/.github/workflows/_extension_distribution_macos.yml b/.github/workflows/_extension_distribution_macos.yml
diff --git a/duckdb b/duckdb
@@ -1 +1 @@
-Subproject commit 1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed
+Subproject commit fcee4de6bc0c9bfe65471e9f180cd35c76266412
diff --git a/src/include/mysql_connection.hpp b/src/include/mysql_connection.hpp
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include "duckdb/common/shared_ptr.hpp"
 #include "mysql_utils.hpp"
 #include "mysql_result.hpp"
 
diff --git a/src/include/mysql_scanner_extension.hpp b/src/include/mysql_scanner_extension.hpp
@@ -8,7 +8,7 @@
 
 using namespace duckdb;
 
-class MySQLScannerExtension : public Extension {
+class MysqlScannerExtension : public Extension {
 public:
 	std::string Name() override {
 		return "mysql_scanner";
diff --git a/src/include/storage/mysql_table_entry.hpp b/src/include/storage/mysql_table_entry.hpp
@@ -44,7 +44,7 @@ class MySQLTableEntry : public TableCatalogEntry {
 
 	TableStorageInfo GetStorageInfo(ClientContext &context) override;
 
-	void BindUpdateConstraints(LogicalGet &get, LogicalProjection &proj, LogicalUpdate &update,
+	void BindUpdateConstraints(Binder &binder, LogicalGet &get, LogicalProjection &proj, LogicalUpdate &update,
 	                           ClientContext &context) override;
 };
 
diff --git a/src/mysql_connection.cpp b/src/mysql_connection.cpp
@@ -28,7 +28,7 @@ MySQLConnection &MySQLConnection::operator=(MySQLConnection &&other) noexcept {
 
 MySQLConnection MySQLConnection::Open(const string &connection_string) {
 	MySQLConnection result;
-	result.connection = make_shared<OwnedMySQLConnection>(MySQLUtils::Connect(connection_string));
+	result.connection = make_shared_ptr<OwnedMySQLConnection>(MySQLUtils::Connect(connection_string));
 	result.dsn = connection_string;
 	result.Execute("SET character_set_results = 'utf8mb4';");
 	return result;
diff --git a/src/mysql_extension.cpp b/src/mysql_extension.cpp
@@ -97,7 +97,7 @@ static void LoadInternal(DatabaseInstance &db) {
 	config.optimizer_extensions.push_back(std::move(mysql_optimizer));
 }
 
-void MySQLScannerExtension::Load(DuckDB &db) {
+void MysqlScannerExtension::Load(DuckDB &db) {
 	LoadInternal(*db.instance);
 }
 
diff --git a/src/storage/mysql_table_entry.cpp b/src/storage/mysql_table_entry.cpp
@@ -81,7 +81,7 @@ unique_ptr<BaseStatistics> MySQLTableEntry::GetStatistics(ClientContext &context
 	return nullptr;
 }
 
-void MySQLTableEntry::BindUpdateConstraints(LogicalGet &, LogicalProjection &, LogicalUpdate &, ClientContext &) {
+void MySQLTableEntry::BindUpdateConstraints(Binder &binder, LogicalGet &, LogicalProjection &, LogicalUpdate &, ClientContext &) {
 }
 
 TableFunction MySQLTableEntry::GetScanFunction(ClientContext &context, unique_ptr<FunctionData> &bind_data) {
diff --git a/test/sql/test_case_insensitivity.test b/test/sql/test_case_insensitivity.test
@@ -4,7 +4,9 @@
 
 require mysql_scanner
 
-require-env MYSQL_TEST_DATABASE_AVAILABLErequire-env POSTGRES_TEST_DATABASE_AVAILABLE
+require-env MYSQL_TEST_DATABASE_AVAILABLE
+
+require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
 statement ok
 ATTACH 'host=localhost user=root port=0 database=mysqlscanner' AS s (TYPE MYSQL_SCANNER)
diff --git a/vcpkg_ports/libmysql/portfile.cmake b/vcpkg_ports/libmysql/portfile.cmake
@@ -22,22 +22,18 @@ endif()
 
 set(CROSS_COMPILING "")
 set(STACK_DIRECTION "")
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+if(NOT VCPKG_TARGET_IS_WINDOWS)
     set(STACK_DIRECTION -DSTACK_DIRECTION=-1)
-else()
-    # ARM builds are always cross compiled
+    set(HAVE_IB_GCC_ATOMIC_BUILTINS 0)
+    set(CROSS_COMPILING -DCMAKE_CROSSCOMPILING=1)
+    # Non-Windows builds are always cross-compiled
     # as such we build the executables (comp_sql, uca9dump, comp_client_err) separately
     set(PATCH_FILES
         ${PATCH_FILES}
         remove_executables.patch
     )
-    if(VCPKG_TARGET_IS_LINUX)
-        set(CROSS_COMPILING -DCMAKE_CROSSCOMPILING=1)
-        set(STACK_DIRECTION -DSTACK_DIRECTION=-1)
-    endif()
 endif()
 
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mysql/mysql-server

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ static void LoadInternal(DatabaseInstance &db) {`
`97`	`97`	`config.optimizer_extensions.push_back(std::move(mysql_optimizer));`
`98`	`98`	`}`
`99`	`99`
`100`		`-void MySQLScannerExtension::Load(DuckDB &db) {`
	`100`	`+void MysqlScannerExtension::Load(DuckDB &db) {`
`101`	`101`	`LoadInternal(*db.instance);`
`102`	`102`	`}`
`103`	`103`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ unique_ptr<BaseStatistics> MySQLTableEntry::GetStatistics(ClientContext &context`
`81`	`81`	`return nullptr;`
`82`	`82`	`}`
`83`	`83`
`84`		`-void MySQLTableEntry::BindUpdateConstraints(LogicalGet &, LogicalProjection &, LogicalUpdate &, ClientContext &) {`
	`84`	`+void MySQLTableEntry::BindUpdateConstraints(Binder &binder, LogicalGet &, LogicalProjection &, LogicalUpdate &, ClientContext &) {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`TableFunction MySQLTableEntry::GetScanFunction(ClientContext &context, unique_ptr<FunctionData> &bind_data) {`