minor fixes & improvements for PL/pgSQL code

funbringer · funbringer · commit 0042c46fac96 · 2016-08-29T04:03:16.000+03:00
diff --git a/expected/pg_pathman.out b/expected/pg_pathman.out
@@ -133,7 +133,7 @@ SELECT pathman.create_range_partitions('test.range_rel', 'dt', '2015-01-01'::DAT
 ERROR:  Partitioning key 'dt' must be NOT NULL
 ALTER TABLE test.range_rel ALTER COLUMN dt SET NOT NULL;
 SELECT pathman.create_range_partitions('test.range_rel', 'dt', '2015-01-01'::DATE, '1 month'::INTERVAL, 2);
-ERROR:  Not enough partitions to fit all the values of 'dt'
+ERROR:  Not enough partitions to fit all values of 'dt'
 SELECT pathman.create_range_partitions('test.range_rel', 'DT', '2015-01-01'::DATE, '1 month'::INTERVAL);
 NOTICE:  sequence "range_rel_seq" does not exist, skipping
  create_range_partitions 
diff --git a/hash.sql b/hash.sql
@@ -53,7 +53,7 @@ BEGIN
 
 		EXECUTE format('CREATE TABLE %1$s (LIKE %2$s INCLUDING ALL) INHERITS (%2$s)',
 					   v_child_relname,
-					   @extschema@.get_schema_qualified_name(parent_relid));
+					   parent_relid::TEXT);
 
 		EXECUTE format('ALTER TABLE %s ADD CONSTRAINT %s
 						CHECK (@extschema@.get_hash_part_idx(%s(%s), %s) = %s)',
@@ -141,7 +141,7 @@ BEGIN
 	attr := attname FROM @extschema@.pathman_config WHERE partrel = parent_relid;
 
 	IF attr IS NULL THEN
-		RAISE EXCEPTION 'Table % is not partitioned', quote_ident(parent_relid::TEXT);
+		RAISE EXCEPTION 'Table "%" is not partitioned', parent_relid::TEXT;
 	END IF;
 
 	SELECT string_agg(attname, ', '),
diff --git a/init.sql b/init.sql
@@ -268,7 +268,7 @@ BEGIN
 	/* Create partitions and copy rest of the data */
 	EXECUTE format('WITH part_data AS (DELETE FROM ONLY %1$s RETURNING *)
 					INSERT INTO %1$s SELECT * FROM part_data',
-				   @extschema@.get_schema_qualified_name(parent_relid));
+				   parent_relid::TEXT);
 
 	/* Get number of inserted rows */
 	GET DIAGNOSTICS p_total = ROW_COUNT;
@@ -317,7 +317,7 @@ BEGIN
 
 	IF rel_persistence = 't'::CHAR THEN
 		RAISE EXCEPTION 'Temporary table "%" cannot be partitioned',
-			quote_ident(p_relation::TEXT);
+						p_relation::TEXT;
 	END IF;
 
 	IF EXISTS (SELECT * FROM @extschema@.pathman_config
diff --git a/range.sql b/range.sql
