webmacro

Author: lmangani

.github/workflows/MainDistributionPipeline.yml

@@ -18,15 +18,15 @@ jobs:
     with:
       duckdb_version: main
       ci_tools_version: main
-      extension_name: webxtension
+      extension_name: webmacro
 
   duckdb-stable-build:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/[email protected]
     with:
       duckdb_version: v1.1.3
       ci_tools_version: v1.1.3
-      extension_name: webxtension
+      extension_name: webmacro
 
   duckdb-stable-deploy:
     name: Deploy extension binaries
@@ -35,5 +35,5 @@ jobs:
     secrets: inherit
     with:
       duckdb_version: v1.1.3
-      extension_name: webxtension
+      extension_name: webmacro
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 # Set extension name here
-set(TARGET_NAME webxtension)
+set(TARGET_NAME webmacro)
 
 # DuckDB's extension distribution supports vcpkg. As such, dependencies can be added in ./vcpkg.json and then
 # used in cmake with find_package. Feel free to remove or replace with other dependencies.
@@ -14,7 +14,7 @@ set(LOADABLE_EXTENSION_NAME ${TARGET_NAME}_loadable_extension)
 project(${TARGET_NAME})
 include_directories(src/include duckdb/third_party/httplib)
 
-set(EXTENSION_SOURCES src/webxtension_extension.cpp)
+set(EXTENSION_SOURCES src/webmacro_extension.cpp)
 
 if(MINGW)
     set(OPENSSL_USE_STATIC_LIBS TRUE)

Makefile

@@ -1,8 +1,8 @@
 PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
 # Configuration of extension
-EXT_NAME=webxtension
+EXT_NAME=webmacro
 EXT_CONFIG=${PROJ_DIR}extension_config.cmake
 
 # Include the Makefile from extension-ci-tools
-include extension-ci-tools/makefiles/duckdb_extension.Makefile
+include extension-ci-tools/makefiles/duckdb_extension.Makefile

README.md

@@ -1,4 +1,4 @@
-# DuckDB Webxtension
+# DuckDB WebMacro
 
 This extension allows loading DuckDB Macros (both scalar and table) from URLs, gists, pasties, etc.
 

extension_config.cmake

@@ -1,10 +1,10 @@
 # This file is included by DuckDB's build system. It specifies which extension to load
 
 # Extension from this repo
-duckdb_extension_load(webxtension
+duckdb_extension_load(webmacro
     SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}
     LOAD_TESTS
 )
 
 # Any extra extensions that should be built
-# e.g.: duckdb_extension_load(json)
+# e.g.: duckdb_extension_load(json)

src/include/webxtension_extension.hpp src/include/webmacro_extension.hppsrc/include/webxtension_extension.hpp renamed to src/include/webmacro_extension.hpp

@@ -4,7 +4,7 @@
 
 namespace duckdb {
 
-class WebxtensionExtension : public Extension {
+class WebmacroExtension : public Extension {
 public:
 	void Load(DuckDB &db) override;
 	std::string Name() override;

src/webxtension_extension.cpp src/webmacro_extension.cppsrc/webxtension_extension.cpp renamed to src/webmacro_extension.cpp

@@ -1,6 +1,6 @@
 #define DUCKDB_EXTENSION_MAIN
 
-#include "webxtension_extension.hpp"
+#include "webmacro_extension.hpp"
 #include "duckdb.hpp"
 #include "duckdb/common/exception.hpp"
 #include "duckdb/common/string_util.hpp"
@@ -229,17 +229,17 @@ static void LoadInternal(DatabaseInstance &instance) {
     );
 }
 
-void WebxtensionExtension::Load(DuckDB &db) {
+void WebmacroExtension::Load(DuckDB &db) {
     LoadInternal(*db.instance);
 }
 
-std::string WebxtensionExtension::Name() {
-    return "webxtension";
+std::string WebmacroExtension::Name() {
+    return "webmacro";
 }
 
-std::string WebxtensionExtension::Version() const {
-#ifdef EXT_VERSION_WEBXTENSION
-    return EXT_VERSION_WEBXTENSION;
+std::string WebmacroExtension::Version() const {
+#ifdef EXT_VERSION_WEBMACRO
+    return EXT_VERSION_WEBMACRO;
 #else
     return "";
 #endif
@@ -248,12 +248,12 @@ std::string WebxtensionExtension::Version() const {
 } // namespace duckdb
 
 extern "C" {
-DUCKDB_EXTENSION_API void webxtension_init(duckdb::DatabaseInstance &db) {
+DUCKDB_EXTENSION_API void webmacro_init(duckdb::DatabaseInstance &db) {
     duckdb::DuckDB db_wrapper(db);
-    db_wrapper.LoadExtension<duckdb::WebxtensionExtension>();
+    db_wrapper.LoadExtension<duckdb::WebmacroExtension>();
 }
 
-DUCKDB_EXTENSION_API const char *webxtension_version() {
+DUCKDB_EXTENSION_API const char *webmacro_version() {
     return duckdb::DuckDB::LibraryVersion();
 }
 }

test/sql/webxtension.test test/sql/webmacro.testtest/sql/webxtension.test renamed to test/sql/webmacro.test

@@ -4,6 +4,6 @@
 
 # Before we load the extension, this will fail
 statement error
-SELECT webxtension('Sam');
+SELECT load_macro_from_url('Sam');
 ----
-Catalog Error: Scalar Function with name webxtension does not exist!
+Catalog Error: Scalar Function with name load_macro_from_url does not exist!