chore: Update vendored sources to duckdb/duckdb@9662e5c

Merge pull request duckdb/duckdb#12077 from hawkfish/collate-serialize
duckdb · May 17, 2024 · 584f351 · 584f351
1 parent cc56888
commit 584f351
Show file tree

Hide file tree

Showing 3 changed files with 138 additions and 3 deletions.
diff --git a/src/duckdb/src/function/table/version/pragma_version.cpp b/src/duckdb/src/function/table/version/pragma_version.cpp
@@ -1,5 +1,5 @@
 #ifndef DUCKDB_PATCH_VERSION
-#define DUCKDB_PATCH_VERSION "3-dev1200"
+#define DUCKDB_PATCH_VERSION "3-dev1208"
 #endif
 #ifndef DUCKDB_MINOR_VERSION
 #define DUCKDB_MINOR_VERSION 10
@@ -8,10 +8,10 @@
 #define DUCKDB_MAJOR_VERSION 0
 #endif
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "v0.10.3-dev1200"
+#define DUCKDB_VERSION "v0.10.3-dev1208"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "f84c289c30"
+#define DUCKDB_SOURCE_ID "9662e5c20a"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

diff --git a/src/duckdb/src/include/duckdb/main/extension_entries.hpp b/src/duckdb/src/include/duckdb/main/extension_entries.hpp
@@ -55,6 +55,136 @@ static constexpr ExtensionFunctionEntry EXTENSION_FUNCTIONS[] = {
     {"iceberg_scan", "iceberg", CatalogType::TABLE_FUNCTION_ENTRY},
     {"iceberg_snapshots", "iceberg", CatalogType::TABLE_FUNCTION_ENTRY},
     {"icu_calendar_names", "icu", CatalogType::TABLE_FUNCTION_ENTRY},
+    {"icu_collate_af", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_am", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ar", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ar_sa", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_as", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_az", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_be", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_bg", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_bn", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_bo", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_br", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_bs", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ca", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ceb", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_chr", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_cs", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_cy", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_da", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_de", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_de_at", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_dsb", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_dz", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ee", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_el", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_en", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_en_us", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_eo", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_es", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_et", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_fa", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_fa_af", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ff", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_fi", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_fil", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_fo", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_fr", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_fr_ca", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_fy", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ga", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_gl", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_gu", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ha", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_haw", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_he", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_he_il", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_hi", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_hr", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_hsb", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_hu", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_hy", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_id", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_id_id", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ig", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_is", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_it", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ja", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ka", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_kk", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_kl", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_km", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_kn", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ko", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_kok", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ku", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ky", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_lb", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_lkt", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ln", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_lo", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_lt", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_lv", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_mk", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ml", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_mn", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_mr", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ms", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_mt", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_my", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_nb", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_nb_no", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ne", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_nl", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_nn", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_om", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_or", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_pa", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_pa_in", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_pl", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ps", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_pt", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ro", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ru", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_sa", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_se", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_si", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_sk", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_sl", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_smn", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_sq", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_sr", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_sr_ba", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_sr_me", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_sr_rs", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_sv", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_sw", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ta", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_te", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_th", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_tk", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_to", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_tr", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ug", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_uk", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_ur", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_uz", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_vi", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_wae", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_wo", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_xh", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_yi", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_yo", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_yue", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_yue_cn", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_zh", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_zh_cn", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_zh_hk", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_zh_mo", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_zh_sg", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_zh_tw", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
+    {"icu_collate_zu", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
     {"icu_sort_key", "icu", CatalogType::SCALAR_FUNCTION_ENTRY},
     {"json", "json", CatalogType::MACRO_ENTRY},
     {"json_array", "json", CatalogType::SCALAR_FUNCTION_ENTRY},

diff --git a/src/duckdb/src/main/extension/extension_util.cpp b/src/duckdb/src/main/extension/extension_util.cpp
@@ -101,6 +101,11 @@ void ExtensionUtil::RegisterCollation(DatabaseInstance &db, CreateCollationInfo
 	auto data = CatalogTransaction::GetSystemTransaction(db);
 	info.on_conflict = OnCreateConflict::IGNORE_ON_CONFLICT;
 	system_catalog.CreateCollation(data, info);
+
+	// Also register as a function for serialisation
+	CreateScalarFunctionInfo finfo(info.function);
+	finfo.on_conflict = OnCreateConflict::IGNORE_ON_CONFLICT;
+	system_catalog.CreateFunction(data, finfo);
 }
 
 void ExtensionUtil::AddFunctionOverload(DatabaseInstance &db, ScalarFunction function) {