refactor: move override_create_ext_statement

to `extensions_parameter_overrides.{h,c}`

Author: soedirgo

src/extensions_parameter_overrides.c

@@ -128,3 +128,42 @@ parse_extensions_parameter_overrides(const char *str,
 
     return state;
 }
+
+void override_create_ext_statement(CreateExtensionStmt *stmt,
+                                   const size_t total_epos,
+                                   const extension_parameter_overrides *epos) {
+    for (size_t i = 0; i < total_epos; i++) {
+        if (strcmp(epos[i].name, stmt->extname) == 0) {
+            const extension_parameter_overrides *epo = &epos[i];
+            DefElem *schema_option = NULL;
+            DefElem *schema_override_option = NULL;
+            ListCell *option_cell;
+
+            if (epo->schema != NULL) {
+                Node *schema_node = (Node *)makeString(pstrdup(epo->schema));
+                schema_override_option = makeDefElem("schema", schema_node, -1);
+            }
+
+            foreach (option_cell, stmt->options) {
+                DefElem *defel = (DefElem *)lfirst(option_cell);
+
+                if (strcmp(defel->defname, "schema") == 0) {
+                    if (schema_option != NULL) {
+                        ereport(ERROR,
+                                (errcode(ERRCODE_SYNTAX_ERROR),
+                                 errmsg("conflicting or redundant options")));
+                    }
+                    schema_option = defel;
+                }
+            }
+
+            if (schema_override_option != NULL) {
+                if (schema_option != NULL) {
+                    stmt->options =
+                        list_delete_ptr(stmt->options, schema_option);
+                }
+                stmt->options = lappend(stmt->options, schema_override_option);
+            }
+        }
+    }
+}

src/extensions_parameter_overrides.h

@@ -1,6 +1,8 @@
 #ifndef EXTENSIONS_PARAMETER_OVERRIDES_H
 #define EXTENSIONS_PARAMETER_OVERRIDES_H
 
+#include "pg_prelude.h"
+
 typedef struct {
     char *name;
     char *schema;
@@ -29,4 +31,9 @@ extern json_extension_parameter_overrides_parse_state
 parse_extensions_parameter_overrides(const char *str,
                                      extension_parameter_overrides *epos);
 
+extern void
+override_create_ext_statement(CreateExtensionStmt *stmt,
+                              const size_t total_epos,
+                              const extension_parameter_overrides *epos);
+
 #endif

src/privileged_extensions.c

@@ -1,5 +1,4 @@
 #include "pg_prelude.h"
-#include "extensions_parameter_overrides.h"
 #include "privileged_extensions.h"
 #include "utils.h"
 
@@ -159,43 +158,6 @@ void run_ext_after_create_script(char *extname, List *options, const char *privi
                       extcascade);
 }
 
-void override_create_ext_statement(CreateExtensionStmt *stmt, const size_t total_epos, const extension_parameter_overrides *epos){
-    for (size_t i = 0; i < total_epos; i++) {
-        if (strcmp(epos[i].name, stmt->extname) == 0) {
-            const extension_parameter_overrides *epo = &epos[i];
-            DefElem *schema_option = NULL;
-            DefElem *schema_override_option = NULL;
-            ListCell *option_cell;
-
-            if (epo->schema != NULL) {
-                Node *schema_node = (Node *)makeString(pstrdup(epo->schema));
-                schema_override_option = makeDefElem("schema", schema_node, -1);
-            }
-
-            foreach (option_cell, stmt->options) {
-                DefElem *defel = (DefElem *)lfirst(option_cell);
-
-                if (strcmp(defel->defname, "schema") == 0) {
-                    if (schema_option != NULL) {
-                        ereport(ERROR,
-                                (errcode(ERRCODE_SYNTAX_ERROR),
-                                 errmsg("conflicting or redundant options")));
-                    }
-                    schema_option = defel;
-                }
-            }
-
-            if (schema_override_option != NULL) {
-                if (schema_option != NULL) {
-                    stmt->options =
-                        list_delete_ptr(stmt->options, schema_option);
-                }
-                stmt->options = lappend(stmt->options, schema_override_option);
-            }
-        }
-    }
-}
-
 bool all_extensions_are_privileged(List *objects, const char *privileged_extensions){
   ListCell *lc;
 

src/privileged_extensions.h

@@ -1,7 +1,6 @@
 #ifndef PRIVILEGED_EXTENSIONS_H
 #define PRIVILEGED_EXTENSIONS_H
 
-#include "extensions_parameter_overrides.h"
 #include "utils.h"
 
 bool all_extensions_are_privileged(List *objects, const char *privileged_extensions);
@@ -14,6 +13,4 @@ void run_ext_before_create_script(char *extname, List *options, const char *priv
 
 void run_ext_after_create_script(char *extname, List *options, const char *privileged_extensions_custom_scripts_path);
 
-void override_create_ext_statement(CreateExtensionStmt *stmt, const size_t total_epos, const extension_parameter_overrides *epos);
-
 #endif