Merge pull request #1 from ea-cm/qualify-partition-type

Qualify partition_type in extschema

sql/functions/create_id_function.sql

@@ -30,7 +30,7 @@ BEGIN
 SELECT nspname INTO v_jobmon_schema FROM pg_namespace n, pg_extension e WHERE e.extname = 'pg_jobmon' AND e.extnamespace = n.oid;
 IF v_jobmon_schema IS NOT NULL THEN
     SELECT current_setting('search_path') INTO v_old_search_path;
-    EXECUTE 'SELECT set_config(''search_path'',''part,'||v_jobmon_schema||''',''false'')';
+    EXECUTE 'SELECT set_config(''search_path'',''@extschema@,'||v_jobmon_schema||''',''false'')';
 END IF;
 
 IF v_jobmon_schema IS NOT NULL THEN
@@ -161,7 +161,7 @@ END IF;
 EXCEPTION
     WHEN OTHERS THEN
         IF v_jobmon_schema IS NOT NULL THEN
-            EXECUTE 'SELECT set_config(''search_path'',''part,'||v_jobmon_schema||''',''false'')';
+            EXECUTE 'SELECT set_config(''search_path'',''@extschema@,'||v_jobmon_schema||''',''false'')';
             IF v_job_id IS NULL THEN
                 v_job_id := add_job('PARTMAN CREATE FUNCTION: '||p_parent_table);
                 v_step_id := add_step(v_job_id, 'Partition function maintenance for table '||p_parent_table||' failed');

sql/functions/create_id_partition.sql

@@ -16,7 +16,7 @@ BEGIN
 SELECT nspname INTO v_jobmon_schema FROM pg_namespace n, pg_extension e WHERE e.extname = 'pg_jobmon' AND e.extnamespace = n.oid;
 IF v_jobmon_schema IS NOT NULL THEN
     SELECT current_setting('search_path') INTO v_old_search_path;
-    EXECUTE 'SELECT set_config(''search_path'',''part,'||v_jobmon_schema||''',''false'')';
+    EXECUTE 'SELECT set_config(''search_path'',''@extschema@,'||v_jobmon_schema||''',''false'')';
 END IF;
 
 FOREACH v_id IN ARRAY p_partition_ids LOOP
@@ -59,7 +59,7 @@ RETURN v_partition_name;
 EXCEPTION
     WHEN OTHERS THEN
         IF v_jobmon_schema IS NOT NULL THEN
-            EXECUTE 'SELECT set_config(''search_path'',''part,'||v_jobmon_schema||''',''false'')';
+            EXECUTE 'SELECT set_config(''search_path'',''@extschema@,'||v_jobmon_schema||''',''false'')';
             IF v_job_id IS NULL THEN
                 v_job_id := add_job('PARTMAN CREATE TABLE: '||p_parent_table);
                 v_step_id := add_step(v_job_id, 'Partition maintenance for table '||p_parent_table||' failed');

sql/functions/create_parent.sql

@@ -30,7 +30,7 @@ EXECUTE 'LOCK TABLE '||p_parent_table||' IN ACCESS EXCLUSIVE MODE';
 SELECT nspname INTO v_jobmon_schema FROM pg_namespace n, pg_extension e WHERE e.extname = 'pg_jobmon' AND e.extnamespace = n.oid;
 IF v_jobmon_schema IS NOT NULL THEN
     SELECT current_setting('search_path') INTO v_old_search_path;
-    EXECUTE 'SELECT set_config(''search_path'',''part,'||v_jobmon_schema||''',''false'')';
+    EXECUTE 'SELECT set_config(''search_path'',''@extschema@,'||v_jobmon_schema||''',''false'')';
 END IF;
 
 IF v_jobmon_schema IS NOT NULL THEN
@@ -136,7 +136,7 @@ PERFORM close_job(v_job_id);
 EXCEPTION
     WHEN OTHERS THEN
         IF v_jobmon_schema IS NOT NULL THEN
-            EXECUTE 'SELECT set_config(''search_path'',''part,'||v_jobmon_schema||''',''false'')';
+            EXECUTE 'SELECT set_config(''search_path'',''@extschema@,'||v_jobmon_schema||''',''false'')';
             IF v_job_id IS NULL THEN
                 v_job_id := add_job('PARTMAN CREATE PARENT: '||p_parent_table);
                 v_step_id := add_step(v_job_id, 'Partition creation for table '||p_parent_table||' failed');

sql/functions/create_time_function.sql

@@ -28,7 +28,7 @@ BEGIN
 SELECT nspname INTO v_jobmon_schema FROM pg_namespace n, pg_extension e WHERE e.extname = 'pg_jobmon' AND e.extnamespace = n.oid;
 IF v_jobmon_schema IS NOT NULL THEN
     SELECT current_setting('search_path') INTO v_old_search_path;
-    EXECUTE 'SELECT set_config(''search_path'',''part,'||v_jobmon_schema||''',''false'')';
+    EXECUTE 'SELECT set_config(''search_path'',''@extschema@,'||v_jobmon_schema||''',''false'')';
 END IF;
 
 IF v_jobmon_schema IS NOT NULL THEN
@@ -160,7 +160,7 @@ END IF;
 EXCEPTION
     WHEN OTHERS THEN
         IF v_jobmon_schema IS NOT NULL THEN
-            EXECUTE 'SELECT set_config(''search_path'',''part,'||v_jobmon_schema||''',''false'')';
+            EXECUTE 'SELECT set_config(''search_path'',''@extschema@,'||v_jobmon_schema||''',''false'')';
             IF v_job_id IS NULL THEN
                 v_job_id := add_job('PARTMAN CREATE FUNCTION: '||p_parent_table);
                 v_step_id := add_step(v_job_id, 'Partition function maintenance for table '||p_parent_table||' failed');

sql/functions/create_time_partition.sql

@@ -18,7 +18,7 @@ BEGIN
 SELECT nspname INTO v_jobmon_schema FROM pg_namespace n, pg_extension e WHERE e.extname = 'pg_jobmon' AND e.extnamespace = n.oid;
 IF v_jobmon_schema IS NOT NULL THEN
     SELECT current_setting('search_path') INTO v_old_search_path;
-    EXECUTE 'SELECT set_config(''search_path'',''part,'||v_jobmon_schema||''',''false'')';
+    EXECUTE 'SELECT set_config(''search_path'',''@extschema@,'||v_jobmon_schema||''',''false'')';
 END IF;
 
 FOREACH v_time IN ARRAY p_partition_times LOOP    
@@ -101,7 +101,7 @@ RETURN v_partition_name;
 EXCEPTION
     WHEN OTHERS THEN
         IF v_jobmon_schema IS NOT NULL THEN
-            EXECUTE 'SELECT set_config(''search_path'',''part,'||v_jobmon_schema||''',''false'')';
+            EXECUTE 'SELECT set_config(''search_path'',''@extschema@,'||v_jobmon_schema||''',''false'')';
             IF v_job_id IS NULL THEN
                 v_job_id := add_job('PARTMAN CREATE TABLE: '||p_parent_table);
                 v_step_id := add_step(v_job_id, 'Partition maintenance for table '||p_parent_table||' failed');

sql/tables/tables.sql

@@ -1,6 +1,6 @@
 CREATE TABLE part_config (
     parent_table text NOT NULL,
-    type part.partition_type NOT NULL,
+    type @extschema@.partition_type NOT NULL,
     part_interval text NOT NULL,
     control text NOT NULL,
     premake int NOT NULL,