slightly improved error messages

funbringer · funbringer · commit 984f2f45bd26 · 2016-11-25T19:40:58.000+03:00
diff --git a/expected/pathman_basic.out b/expected/pathman_basic.out
@@ -10,7 +10,7 @@ INSERT INTO test.hash_rel VALUES (1, 1);
 INSERT INTO test.hash_rel VALUES (2, 2);
 INSERT INTO test.hash_rel VALUES (3, 3);
 SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3);
-ERROR:  partitioning key 'value' must be NOT NULL
+ERROR:  partitioning key "value" must be NOT NULL
 ALTER TABLE test.hash_rel ALTER COLUMN value SET NOT NULL;
 SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3, partition_data:=false);
  create_hash_partitions 
@@ -131,10 +131,10 @@ CREATE INDEX ON test.range_rel (dt);
 INSERT INTO test.range_rel (dt, txt)
 SELECT g, md5(g::TEXT) FROM generate_series('2015-01-01', '2015-04-30', '1 day'::interval) as g;
 SELECT pathman.create_range_partitions('test.range_rel', 'dt', '2015-01-01'::DATE, '1 month'::INTERVAL, 2);
-ERROR:  partitioning key 'dt' must be NOT NULL
+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 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/init.sql b/init.sql
@@ -376,7 +376,7 @@ BEGIN
 	END IF;
 
 	IF @extschema@.is_attribute_nullable(relation, p_attribute) THEN
-		RAISE EXCEPTION 'partitioning key ''%'' must be NOT NULL', p_attribute;
+		RAISE EXCEPTION 'partitioning key "%" must be NOT NULL', p_attribute;
 	END IF;
 
 	/* Check if there are foreign keys that reference the relation */
diff --git a/range.sql b/range.sql
@@ -45,19 +45,17 @@ BEGIN
 
 	/* Check if column has NULL values */
 	IF v_count > 0 AND (v_min IS NULL OR v_max IS NULL) THEN
-		RAISE EXCEPTION '''%'' column contains NULL values', attribute;
+		RAISE EXCEPTION 'column "%" contains NULL values', attribute;
 	END IF;
 
 	/* Check lower boundary */
 	IF start_value > v_min THEN
-		RAISE EXCEPTION 'start value is less than minimum value of ''%''',
-				attribute;
+		RAISE EXCEPTION 'start value is less than min value of "%"', attribute;
 	END IF;
 
 	/* Check upper boundary */
 	IF end_value <= v_max THEN
-		RAISE EXCEPTION 'not enough partitions to fit all values of ''%''',
-				attribute;
+		RAISE EXCEPTION 'not enough partitions to fit all values of "%"', attribute;
 	END IF;
 END
 $$ LANGUAGE plpgsql;
@@ -225,7 +223,7 @@ BEGIN
 		END IF;
 
 		IF v_max IS NULL THEN
-			RAISE EXCEPTION '''%'' column has NULL values', attribute;
+			RAISE EXCEPTION 'column "%" has NULL values', attribute;
 		END IF;
 
 		p_count := 0;
@@ -577,7 +575,7 @@ BEGIN
 
 	/* Check if this is a RANGE partition */
 	IF v_part_type != 2 THEN
-		RAISE EXCEPTION 'specified partitions aren''t RANGE partitions';
+		RAISE EXCEPTION 'specified partitions are not RANGE partitions';
 	END IF;
 
 	v_atttype := @extschema@.get_attribute_type(partition1, v_attname);
