Skip to content

Commit 1ee5404

Browse files
authored
Merge pull request #108 from carlopi/main
Absorb patch, and move to latest duckdb
2 parents 8742067 + aa5c550 commit 1ee5404

File tree

8 files changed

+20
-14
lines changed

8 files changed

+20
-14
lines changed

.github/workflows/MainDistributionPipeline.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ 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:
19-
duckdb_version: v1.0.0
19+
duckdb_version: main
2020
extension_name: sqlite_scanner
2121

2222
duckdb-stable-deploy:
2323
name: Deploy extension binaries
2424
needs: duckdb-stable-build
25-
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.0.0
25+
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
2626
secrets: inherit
2727
with:
28-
duckdb_version: v1.0.0
28+
duckdb_version: main
2929
extension_name: sqlite_scanner
3030
deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
3131
deploy_versioned: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}

duckdb

Submodule duckdb updated 3552 files

src/include/storage/sqlite_delete.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class SQLiteDelete : public PhysicalOperator {
4242
}
4343

4444
string GetName() const override;
45-
string ParamsToString() const override;
45+
InsertionOrderPreservingMap<string> ParamsToString() const override;
4646
};
4747

4848
} // namespace duckdb

src/include/storage/sqlite_insert.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class SQLiteInsert : public PhysicalOperator {
5151
}
5252

5353
string GetName() const override;
54-
string ParamsToString() const override;
54+
InsertionOrderPreservingMap<string> ParamsToString() const override;
5555
};
5656

5757
} // namespace duckdb

src/include/storage/sqlite_update.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class SQLiteUpdate : public PhysicalOperator {
4444
}
4545

4646
string GetName() const override;
47-
string ParamsToString() const override;
47+
InsertionOrderPreservingMap<string> ParamsToString() const override;
4848
};
4949

5050
} // namespace duckdb

src/storage/sqlite_delete.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ string SQLiteDelete::GetName() const {
7878
return "DELETE";
7979
}
8080

81-
string SQLiteDelete::ParamsToString() const {
82-
return table.name;
81+
InsertionOrderPreservingMap<string> SQLiteDelete::ParamsToString() const {
82+
InsertionOrderPreservingMap<string> result;
83+
result["Table Name"] = table.name;
84+
return result;
8385
}
8486

8587
//===--------------------------------------------------------------------===//

src/storage/sqlite_insert.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,10 @@ string SQLiteInsert::GetName() const {
132132
return table ? "INSERT" : "CREATE_TABLE_AS";
133133
}
134134

135-
string SQLiteInsert::ParamsToString() const {
136-
return table ? table->name : info->Base().table;
135+
InsertionOrderPreservingMap<string> SQLiteInsert::ParamsToString() const {
136+
InsertionOrderPreservingMap<string> result;
137+
result["Table Name"] = table ? table->name : info->Base().table;
138+
return result;
137139
}
138140

139141
//===--------------------------------------------------------------------===//

src/storage/sqlite_update.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,10 @@ string SQLiteUpdate::GetName() const {
9494
return "UPDATE";
9595
}
9696

97-
string SQLiteUpdate::ParamsToString() const {
98-
return table.name;
97+
InsertionOrderPreservingMap<string> SQLiteUpdate::ParamsToString() const {
98+
InsertionOrderPreservingMap<string> result;
99+
result["Table Name"] = table.name;
100+
return result;
99101
}
100102

101103
//===--------------------------------------------------------------------===//

0 commit comments

Comments
 (0)