add remove rule in databricks. clean up unused code like remove-functions rule

Author: Jesus89

clouds/bigquery/modules/Makefile

@@ -34,10 +34,10 @@ include $(COMMON_DIR)/Makefile
 
 .SILENT:
 
-.PHONY: help lint build build-share deploy deploy-share test remove remove-functions remove-share clean
+.PHONY: help lint build build-share deploy deploy-share test remove remove-share clean
 
 help:
-	echo "Available targets: lint build deploy test remove remove-functions clean"
+	echo "Available targets: lint build deploy test remove clean"
 
 lint: venv3 $(NODE_MODULES_DEV)
 	echo "Linting modules..."
@@ -101,11 +101,6 @@ remove: check
 	GOOGLE_APPLICATION_CREDENTIALS=$(GOOGLE_APPLICATION_CREDENTIALS) \
 	$(COMMON_DIR)/run-script.js $(COMMON_DIR)/DROP_FUNCTIONS.sql
 
-remove-functions: check
-	echo "Removing functions..."
-	REPLACEMENTS=$(REPLACEMENTS)" "$(REPLACEMENTS_EXTRA) \
-	GOOGLE_APPLICATION_CREDENTIALS=$(GOOGLE_APPLICATION_CREDENTIALS) \
-	$(COMMON_DIR)/run-script.js $(COMMON_DIR)/DROP_FUNCTIONS.sql
 
 clean:
 	echo "Cleaning modules..."

clouds/databricks/common/DROP_FUNCTIONS.sql

@@ -0,0 +1,17 @@
+----------------------------
+-- Copyright (C) 2025 CARTO
+----------------------------
+
+CREATE OR REPLACE PROCEDURE @@DB_SCHEMA@@.DROP_FUNCTIONS()
+SQL SECURITY INVOKER
+BEGIN
+    FOR record AS
+        SELECT CONCAT('DROP ', routine_type, ' `', routine_catalog, '`.`', routine_schema, '`.`', routine_name,'`;') AS drop_command
+        FROM @@DB_CATALOG@@.INFORMATION_SCHEMA.ROUTINES
+        WHERE routine_schema = '@@DB_UNQUALIFIED_SCHEMA@@'
+    DO
+        EXECUTE IMMEDIATE record.drop_command;
+    END FOR;
+END;
+
+CALL @@DB_SCHEMA@@.DROP_FUNCTIONS();

clouds/databricks/common/Makefile

@@ -15,12 +15,23 @@ ifdef catalog
 export DB_CATALOG = $(catalog)
 endif
 
+export DB_CATALOG := \`$(DB_CATALOG)\`
+
+ifeq ($(production),1)
+export DB_SCHEMA = $(DB_CATALOG).\`$(DB_SCHEMA_DEFAULT)\`
+else
+export DB_SCHEMA = $(DB_CATALOG).\`$(DB_PREFIX)$(DB_SCHEMA_DEFAULT)\`
+endif
+
 ifeq ($(production),1)
-export DB_SCHEMA = \`$(DB_CATALOG)\`.\`$(DB_SCHEMA_DEFAULT)\`
+export DB_SCHEMA = $(DB_CATALOG).\`$(DB_SCHEMA_DEFAULT)\`
+export DB_UNQUALIFIED_SCHEMA = $(DB_SCHEMA_DEFAULT)
 else
-export DB_SCHEMA = \`$(DB_CATALOG)\`.\`$(DB_PREFIX)$(DB_SCHEMA_DEFAULT)\`
+export DB_SCHEMA = $(DB_CATALOG).\`$(DB_PREFIX)$(DB_SCHEMA_DEFAULT)\`
+export DB_UNQUALIFIED_SCHEMA = $(DB_PREFIX)$(DB_SCHEMA_DEFAULT)
 endif
 
+
 .SILENT:
 
 .PHONY: check venv3 $(NODE_MODULES_DEV)

clouds/databricks/common/build_modules.js

@@ -150,10 +150,10 @@ function apply_replacements (text) {
     return text;
 }
 
-// if (argv.dropfirst) {
-//     const header = fs.readFileSync(path.resolve(__dirname, 'DROP_FUNCTIONS.sql')).toString();
-//     content = header + content;
-// }
+if (argv.dropfirst) {
+    const header = fs.readFileSync(path.resolve(__dirname, 'DROP_FUNCTIONS.sql')).toString();
+    content = header + content;
+}
 
 const footer = fs.readFileSync(path.resolve(__dirname, 'VERSION.sql')).toString();
 content += footer;
@@ -162,4 +162,4 @@ content = apply_replacements(content);
 
 // Write modules.sql file
 fs.writeFileSync(path.join(outputDir, 'modules.sql'), content);
-console.log(`Write ${outputDir}/modules.sql`);
+console.log(`Write ${outputDir}/modules.sql`);

clouds/databricks/common/run_script.py

@@ -16,6 +16,8 @@ def apply_replacements(text):
             if replacement:
                 pattern = re.compile(f'@@{replacement}@@', re.MULTILINE)
                 text = pattern.sub(os.environ.get(replacement, ''), text)
+    # Add the missing backtick unescaping (like build_modules.js line 149)
+    text = text.replace('\\`', '`')
     return text
 
 

clouds/databricks/modules/Makefile

@@ -15,7 +15,7 @@ else
 export DB_PACKAGE_VERSION ?= $(shell cat $(ROOT_DIR)/../version)-dev
 endif
 
-REPLACEMENTS = "DB_SCHEMA DB_VERSION_FUNCTION DB_PACKAGE_VERSION"
+REPLACEMENTS = "DB_SCHEMA DB_CATALOG DB_UNQUALIFIED_SCHEMA DB_VERSION_FUNCTION DB_PACKAGE_VERSION"
 
 include $(COMMON_DIR)/Makefile
 
@@ -61,7 +61,8 @@ test: check venv3 $(NODE_MODULES_DEV)
 
 remove: venv3
 	echo "Removing modules..."
-	$(VENV3_BIN)/python $(COMMON_DIR)/run_query.py "DROP SCHEMA IF EXISTS $(DB_SCHEMA) CASCADE;"
+	REPLACEMENTS=$(REPLACEMENTS)" "$(REPLACEMENTS_EXTRA) \
+	$(VENV3_BIN)/python $(COMMON_DIR)/run_script.py $(COMMON_DIR)/DROP_FUNCTIONS.sql
 
 clean:
 	echo "Cleaning modules..."