Skip to content

Commit

Permalink
Update vendored DuckDB sources to 643ca48
Browse files Browse the repository at this point in the history
  • Loading branch information
duckdblabs-bot committed Oct 5, 2024
1 parent 643ca48 commit 0ff8d6a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
9 changes: 8 additions & 1 deletion src/duckdb/src/catalog/catalog_entry/duck_schema_entry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@ optional_ptr<CatalogEntry> DuckSchemaEntry::AddEntryInternal(CatalogTransaction
// first find the set for this entry
auto &set = GetCatalogSet(entry_type);
dependencies.AddDependency(*this);
if (on_conflict == OnCreateConflict::IGNORE_ON_CONFLICT) {
auto old_entry = set.GetEntry(transaction, entry_name);
if (old_entry) {
return nullptr;
}
}

if (on_conflict == OnCreateConflict::REPLACE_ON_CONFLICT) {
// CREATE OR REPLACE: first try to drop the entry
auto old_entry = set.GetEntry(transaction, entry_name);
Expand Down Expand Up @@ -315,7 +322,7 @@ void DuckSchemaEntry::DropEntry(ClientContext &context, DropInfo &info) {
throw InternalException("Failed to drop entry \"%s\" - entry could not be found", info.name);
}
if (existing_entry->type != info.type) {
throw CatalogException("Existing object %s is of type %s, trying to replace with type %s", info.name,
throw CatalogException("Existing object %s is of type %s, trying to drop type %s", info.name,
CatalogTypeToString(existing_entry->type), CatalogTypeToString(info.type));
}

Expand Down
6 changes: 3 additions & 3 deletions src/duckdb/src/function/table/version/pragma_version.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef DUCKDB_PATCH_VERSION
#define DUCKDB_PATCH_VERSION "2-dev87"
#define DUCKDB_PATCH_VERSION "2-dev90"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 1
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 1
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v1.1.2-dev87"
#define DUCKDB_VERSION "v1.1.2-dev90"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "897f93d865"
#define DUCKDB_SOURCE_ID "1eac05ecd3"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down

0 comments on commit 0ff8d6a

Please sign in to comment.