Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Absorb patch, and move to latest duckdb #108

Merged
merged 3 commits into from
Aug 21, 2024
Merged

Absorb patch, and move to latest duckdb #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f4fcdc
Bump to latest duckdb
carlopi Aug 21, 2024
82903a5
Apply patch 'params_to_strings'
carlopi Aug 21, 2024
aa5c550
Move compilation to latest duckdb main
carlopi Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/MainDistributionPipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ concurrency:
jobs:
duckdb-stable-build:
name: Build extension binaries
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.0.0
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
with:
duckdb_version: v1.0.0
duckdb_version: main
extension_name: sqlite_scanner

duckdb-stable-deploy:
name: Deploy extension binaries
needs: duckdb-stable-build
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.0.0
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
secrets: inherit
with:
duckdb_version: v1.0.0
duckdb_version: main
extension_name: sqlite_scanner
deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
deploy_versioned: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
2 changes: 1 addition & 1 deletion duckdb
Open in desktop
Submodule duckdb updated 3552 files
2 changes: 1 addition & 1 deletion src/include/storage/sqlite_delete.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class SQLiteDelete : public PhysicalOperator {
}

string GetName() const override;
string ParamsToString() const override;
InsertionOrderPreservingMap<string> ParamsToString() const override;
};

} // namespace duckdb
2 changes: 1 addition & 1 deletion src/include/storage/sqlite_insert.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class SQLiteInsert : public PhysicalOperator {
}

string GetName() const override;
string ParamsToString() const override;
InsertionOrderPreservingMap<string> ParamsToString() const override;
};

} // namespace duckdb
2 changes: 1 addition & 1 deletion src/include/storage/sqlite_update.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class SQLiteUpdate : public PhysicalOperator {
}

string GetName() const override;
string ParamsToString() const override;
InsertionOrderPreservingMap<string> ParamsToString() const override;
};

} // namespace duckdb
6 changes: 4 additions & 2 deletions src/storage/sqlite_delete.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,10 @@ string SQLiteDelete::GetName() const {
return "DELETE";
}

string SQLiteDelete::ParamsToString() const {
return table.name;
InsertionOrderPreservingMap<string> SQLiteDelete::ParamsToString() const {
InsertionOrderPreservingMap<string> result;
result["Table Name"] = table.name;
return result;
}

//===--------------------------------------------------------------------===//
Expand Down
6 changes: 4 additions & 2 deletions src/storage/sqlite_insert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,10 @@ string SQLiteInsert::GetName() const {
return table ? "INSERT" : "CREATE_TABLE_AS";
}

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

//===--------------------------------------------------------------------===//
Expand Down
6 changes: 4 additions & 2 deletions src/storage/sqlite_update.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,10 @@ string SQLiteUpdate::GetName() const {
return "UPDATE";
}

string SQLiteUpdate::ParamsToString() const {
return table.name;
InsertionOrderPreservingMap<string> SQLiteUpdate::ParamsToString() const {
InsertionOrderPreservingMap<string> result;
result["Table Name"] = table.name;
return result;
}

//===--------------------------------------------------------------------===//
Expand Down
Loading