Align extension to DuckDB 1.1.1 syntax

CMakeLists.txt

@@ -14,7 +14,7 @@ set(LOADABLE_EXTENSION_NAME ${TARGET_NAME}_loadable_extension)
 project(${TARGET_NAME})
 include_directories(src/include)
 
-set(EXTENSION_SOURCES src/dynamic_sql_examples_extension.cpp src/default_table_functions.cpp)
+set(EXTENSION_SOURCES src/dynamic_sql_examples_extension.cpp)
 
 build_static_extension(${TARGET_NAME} ${EXTENSION_SOURCES})
 build_loadable_extension(${TARGET_NAME} " " ${EXTENSION_SOURCES})

src/dynamic_sql_examples_extension.cpp

@@ -11,24 +11,24 @@
 // OpenSSL linked through vcpkg
 #include <openssl/opensslv.h>
 
-#include "default_functions.hpp"
-#include "default_table_functions.hpp"
+#include "duckdb/catalog/default/default_functions.hpp"
+#include "duckdb/catalog/default/default_table_functions.hpp"
 
 namespace duckdb {
 
 // To add a new scalar SQL macro, add a new macro to this array!
 // Copy and paste the top item in the array into the 
 // second-to-last position and make some modifications. 
-// (essentially, leave the last entry in the array as {nullptr, nullptr, {nullptr}, nullptr})
+// (essentially, leave the last entry in the array as {nullptr, nullptr, {nullptr}, {{nullptr, nullptr}}, nullptr})
 
 // Keep the DEFAULT_SCHEMA (no change needed)
 // Replace "times_two" with a name for your macro
 // If your function has parameters, add their names in quotes inside of the {}, with a nullptr at the end
 //      If you do not have parameters, simplify to {nullptr}
 // Add the text of your SQL macro as a raw string with the format R"( select 42 )"
 static DefaultMacro dynamic_sql_examples_macros[] = {
-    {DEFAULT_SCHEMA, "times_two", {"x", nullptr}, R"(x*2)"},
-    {nullptr, nullptr, {nullptr}, nullptr}};
+    {DEFAULT_SCHEMA, "default_to_times_two", {"x", nullptr}, {{"multiplier", "2"}, {nullptr, nullptr}}, R"( x * multiplier )"},
+    {nullptr, nullptr, {nullptr}, {{nullptr, nullptr}}, nullptr}};
 
 
 // To add a new table SQL macro, add a new macro to this array!
@@ -47,7 +47,7 @@ static DefaultMacro dynamic_sql_examples_macros[] = {
 
 // clang-format off
 static const DefaultTableMacro dynamic_sql_examples_table_macros[] = {
-	{DEFAULT_SCHEMA, "times_two_table", {"x", nullptr}, {{"two", "2"}, {nullptr, nullptr}},  R"(SELECT x * two as output_column;)"},
+	{DEFAULT_SCHEMA, "default_to_times_two_table", {"x", nullptr}, {{"multiplier", "2"}, {nullptr, nullptr}},  R"( SELECT x * multiplier as output_column; )"},
 	{nullptr, nullptr, {nullptr}, {{nullptr, nullptr}}, nullptr}
 	};
 // clang-format on

test/sql/dynamic_sql_examples.test

@@ -12,6 +12,19 @@ Catalog Error: Scalar Function with name dynamic_sql_examples does not exist!
 require dynamic_sql_examples
 
 # Confirm the extension works
+
+# Test scalar macro overriding the default
+query I
+SELECT default_to_times_two(4, multiplier:=3);
+----
+12
+
+# Test table macro overriding the default
+query I
+SELECT * FROM default_to_times_two_table(5, multiplier:=3);
+----
+15
+
 query I
 SELECT dynamic_sql_examples('Sam');
 ----