Skip to content

Commit c91ea57

Browse files
committed
Update submodules to DuckDB 8616efa9da
1 parent 66b9a06 commit c91ea57

7 files changed

Lines changed: 10 additions & 10 deletions

File tree

duckdb

Submodule duckdb updated 1066 files

src/include/postgres_binary_copy.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class PostgresBinaryCopyFunction : public CopyFunction {
3535
GlobalFunctionData &gstate);
3636

3737
static unique_ptr<FunctionData> PostgresBinaryReadBind(ClientContext &context, CopyFromFunctionBindInput &info,
38-
vector<string> &expected_names,
38+
vector<Identifier> &expected_names,
3939
vector<LogicalType> &expected_types);
4040
};
4141

src/include/storage/postgres_catalog.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class PostgresCatalog : public Catalog {
4747
string GetCatalogType() override {
4848
return "postgres";
4949
}
50-
Identifier GetDefaultSchema() const override {
51-
return default_schema.empty() ? "public" : default_schema;
50+
optional<Identifier> GetDefaultSchema() const override {
51+
return default_schema.empty() ? Identifier("public") : default_schema;
5252
}
5353

5454
string GetConnectionString();

src/postgres_binary_copy.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void PostgresBinaryCopyFunction::PostgresBinaryWriteFinalize(ClientContext &cont
9898

9999
struct PostgresBinaryReadBindData : public TableFunctionData {
100100
string file_path;
101-
vector<string> names;
101+
vector<Identifier> names;
102102
vector<LogicalType> types;
103103
vector<PostgresType> postgres_types;
104104
idx_t buffer_size = PostgresBinaryFileReader::DEFAULT_BUFFER_SIZE;
@@ -125,7 +125,7 @@ struct PostgresBinaryReadGlobalState : public GlobalTableFunctionState {
125125

126126
unique_ptr<FunctionData> PostgresBinaryCopyFunction::PostgresBinaryReadBind(ClientContext &context,
127127
CopyFromFunctionBindInput &info,
128-
vector<string> &expected_names,
128+
vector<Identifier> &expected_names,
129129
vector<LogicalType> &expected_types) {
130130
auto result = make_uniq<PostgresBinaryReadBindData>();
131131
result->file_path = info.info.file_path;
@@ -178,7 +178,7 @@ static unique_ptr<FunctionData> ReadPostgresBinaryBind(ClientContext &context, T
178178
result->postgres_types.push_back(PostgresUtils::CreateEmptyPostgresType(col_type));
179179
}
180180

181-
result->names = IdentifiersToStrings(names);
181+
result->names = names;
182182
result->types = return_types;
183183

184184
if (input.named_parameters.count("buffer_size")) {

test/sql/storage/attach_connect_display.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require postgres_scanner
1212
statement error
1313
ATTACH 'dbname=nope' AS d (TYPE POSTGRES, CONNECT_DISPLAY NULL)
1414
----
15-
NULL is not supported as a valid option for ATTACH option "connect_display"
15+
NULL is not supported as a valid option for ATTACH option
1616

1717
# the value ends up in the shell prompt verbatim, so escape sequences must not survive
1818
statement error

test/sql/storage/attach_views.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ DELETE FROM v1
4545
statement error
4646
INSERT INTO v1 VALUES (1, 1);
4747
----
48-
table v1 has 1 columns but 2 values were supplied
48+
has 1 columns but 2 values were supplied
4949

5050
statement ok
5151
CREATE VIEW IF NOT EXISTS v1 AS SELECT 84;

0 commit comments

Comments
 (0)