Skip to content

Commit 6519c19

Browse files
authored
Merge pull request duckdb#77 from carlopi/main
Absorb patch and bump to latest duckdb
2 parents 29c1f12 + 7f17657 commit 6519c19

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

.github/workflows/MainDistributionPipeline.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ concurrency:
1414
jobs:
1515
duckdb-stable-build:
1616
name: Build extension binaries
17-
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.0.0
17+
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
1818
with:
1919
extension_name: mysql_scanner
20-
duckdb_version: v1.0.0
20+
duckdb_version: main
2121
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
2222
build_duckdb_shell: false
2323

2424
duckdb-stable-deploy:
2525
name: Deploy extension binaries
2626
needs: duckdb-stable-build
27-
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.0.0
27+
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
2828
secrets: inherit
2929
with:
30-
duckdb_version: v1.0.0
30+
duckdb_version: main
3131
extension_name: mysql_scanner
3232
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
3333
deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}

duckdb

Submodule duckdb updated 3552 files

src/include/storage/mysql_execute_query.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class MySQLExecuteQuery : public PhysicalOperator {
4646
}
4747

4848
string GetName() const override;
49-
string ParamsToString() const override;
49+
InsertionOrderPreservingMap<string> ParamsToString() const override;
5050
};
5151

5252
} // namespace duckdb

src/include/storage/mysql_insert.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class MySQLInsert : public PhysicalOperator {
5353
}
5454

5555
string GetName() const override;
56-
string ParamsToString() const override;
56+
InsertionOrderPreservingMap<string> ParamsToString() const override;
5757
};
5858

5959
} // namespace duckdb

src/storage/mysql_execute_query.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,10 @@ string MySQLExecuteQuery::GetName() const {
7171
return op_name;
7272
}
7373

74-
string MySQLExecuteQuery::ParamsToString() const {
75-
return table.name;
74+
InsertionOrderPreservingMap<string> MySQLExecuteQuery::ParamsToString() const {
75+
InsertionOrderPreservingMap<string> result;
76+
result["Table Name"] = table.name;
77+
return result;
7678
}
7779

7880
//===--------------------------------------------------------------------===//

src/storage/mysql_insert.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,10 @@ string MySQLInsert::GetName() const {
256256
return table ? "MYSQL_INSERT" : "MYSQL_CREATE_TABLE_AS";
257257
}
258258

259-
string MySQLInsert::ParamsToString() const {
260-
return table ? table->name : info->Base().table;
259+
InsertionOrderPreservingMap<string> MySQLInsert::ParamsToString() const {
260+
InsertionOrderPreservingMap<string> result;
261+
result["Table Name"] = table ? table->name : info->Base().table;
262+
return result;
261263
}
262264

263265
//===--------------------------------------------------------------------===//

0 commit comments

Comments
 (0)