Change @ operator signature to (unit, text)

Closes #6

Author: df7cb

Makefile

@@ -4,7 +4,8 @@ EXTENSION = unit
 DATA = unit_prefixes.data unit_units.data \
 	   unit--1.sql unit--1--2.sql \
 	   unit--2.sql
-DATA_built = unit--2--3.sql unit--3.sql
+DATA_built = unit--2--3.sql unit--3.sql \
+			 unit--3--4.sql unit--4.sql
 REGRESS = extension tables unit unicode prefix units temperature functions derived compare aggregate iec custom
 EXTRA_CLEAN = unitparse.yy.* powers powers.o unit-*.dump # unitparse.tab.*
 

debian/changelog

@@ -1,11 +1,12 @@
-postgresql-unit (3.2) UNRELEASED; urgency=medium
+postgresql-unit (4.0) UNRELEASED; urgency=medium
 
   * Support exponents written using Unicode superscript characters.
   * Report 22P02/invalid_text_representation on invalid unit input.
   * Fix crash when unit_reset() runs into an OOM error. Patch by Andreas
     Seltenreich, thanks!
+  * Change @ operator signature to (unit, text).
 
- -- Christoph Berg <[email protected]>  Sat, 08 Apr 2017 18:36:50 +0200
+ -- Christoph Berg <[email protected]>  Fri, 07 Jul 2017 21:42:13 +0200
 
 postgresql-unit (3.1) experimental; urgency=medium
 

expected/convert.out

@@ -9,7 +9,7 @@ WITH
 	('yd'),
 	('mi'))
 SELECT
-  l1.u, l2.u, l1.u::unit @ l2.u::cstring
+  l1.u, l2.u, l1.u::unit @ l2.u
 FROM
   l l1 CROSS JOIN l l2
 \crosstabview
@@ -35,7 +35,7 @@ WITH
 	('yd^2'),
 	('mi^2'))
 SELECT
-  l1.u, l2.u, l1.u::unit @ l2.u::cstring
+  l1.u, l2.u, l1.u::unit @ l2.u
 FROM
   l l1 CROSS JOIN l l2
 \crosstabview
@@ -60,7 +60,7 @@ WITH
 	('ft^3'),
 	('yd^3'))
 SELECT
-  l1.u, l2.u, l1.u::unit @ l2.u::cstring
+  l1.u, l2.u, l1.u::unit @ l2.u
 FROM
   l l1 CROSS JOIN l l2
 \crosstabview
@@ -83,7 +83,7 @@ WITH
 	('oz'),
 	('lb'))
 SELECT
-  l1.u, l2.u, l1.u::unit @ l2.u::cstring
+  l1.u, l2.u, l1.u::unit @ l2.u
 FROM
   l l1 CROSS JOIN l l2
 \crosstabview
@@ -105,7 +105,7 @@ WITH
 	('d'),
 	('julianyear'))
 SELECT
-  l1.u, l2.u, l1.u::unit @ l2.u::cstring
+  l1.u, l2.u, l1.u::unit @ l2.u
 FROM
   l l1 CROSS JOIN l l2
 \crosstabview

expected/upgrade.out

@@ -39,6 +39,18 @@ BEGIN;
 COMMIT;
 \! pg_dump -f unit-2-3.dump -T pg_depend_save
 INSERT INTO pg_depend SELECT * FROM pg_depend_save;
+-- upgrade to version 4
+ALTER EXTENSION unit UPDATE TO "4";
+BEGIN;
+	DELETE FROM pg_depend_save;
+	WITH
+		ext AS (DELETE FROM pg_depend WHERE refobjid =
+			(SELECT oid FROM pg_extension WHERE extname = 'unit')
+			RETURNING *)
+	INSERT INTO pg_depend_save SELECT * FROM ext;
+COMMIT;
+\! pg_dump -f unit-3-4.dump -T pg_depend_save
+INSERT INTO pg_depend SELECT * FROM pg_depend_save;
 -- reinstall latest version
 DROP EXTENSION unit CASCADE;
 CREATE EXTENSION unit;
@@ -50,5 +62,5 @@ BEGIN;
 			RETURNING *)
 	INSERT INTO pg_depend_save SELECT * FROM ext;
 COMMIT;
-\! pg_dump -f unit-3.dump -T pg_depend_save
+\! pg_dump -f unit-4.dump -T pg_depend_save
 INSERT INTO pg_depend SELECT * FROM pg_depend_save;

sql/convert.sql

@@ -9,7 +9,7 @@ WITH
 	('yd'),
 	('mi'))
 SELECT
-  l1.u, l2.u, l1.u::unit @ l2.u::cstring
+  l1.u, l2.u, l1.u::unit @ l2.u
 FROM
   l l1 CROSS JOIN l l2
 \crosstabview
@@ -25,7 +25,7 @@ WITH
 	('yd^2'),
 	('mi^2'))
 SELECT
-  l1.u, l2.u, l1.u::unit @ l2.u::cstring
+  l1.u, l2.u, l1.u::unit @ l2.u
 FROM
   l l1 CROSS JOIN l l2
 \crosstabview
@@ -40,7 +40,7 @@ WITH
 	('ft^3'),
 	('yd^3'))
 SELECT
-  l1.u, l2.u, l1.u::unit @ l2.u::cstring
+  l1.u, l2.u, l1.u::unit @ l2.u
 FROM
   l l1 CROSS JOIN l l2
 \crosstabview
@@ -54,7 +54,7 @@ WITH
 	('oz'),
 	('lb'))
 SELECT
-  l1.u, l2.u, l1.u::unit @ l2.u::cstring
+  l1.u, l2.u, l1.u::unit @ l2.u
 FROM
   l l1 CROSS JOIN l l2
 \crosstabview
@@ -68,7 +68,7 @@ WITH
 	('d'),
 	('julianyear'))
 SELECT
-  l1.u, l2.u, l1.u::unit @ l2.u::cstring
+  l1.u, l2.u, l1.u::unit @ l2.u
 FROM
   l l1 CROSS JOIN l l2
 \crosstabview

sql/upgrade.sql

@@ -44,6 +44,20 @@ COMMIT;
 \! pg_dump -f unit-2-3.dump -T pg_depend_save
 INSERT INTO pg_depend SELECT * FROM pg_depend_save;
 
+-- upgrade to version 4
+ALTER EXTENSION unit UPDATE TO "4";
+
+BEGIN;
+	DELETE FROM pg_depend_save;
+	WITH
+		ext AS (DELETE FROM pg_depend WHERE refobjid =
+			(SELECT oid FROM pg_extension WHERE extname = 'unit')
+			RETURNING *)
+	INSERT INTO pg_depend_save SELECT * FROM ext;
+COMMIT;
+\! pg_dump -f unit-3-4.dump -T pg_depend_save
+INSERT INTO pg_depend SELECT * FROM pg_depend_save;
+
 -- reinstall latest version
 DROP EXTENSION unit CASCADE;
 CREATE EXTENSION unit;
@@ -56,5 +70,5 @@ BEGIN;
 			RETURNING *)
 	INSERT INTO pg_depend_save SELECT * FROM ext;
 COMMIT;
-\! pg_dump -f unit-3.dump -T pg_depend_save
+\! pg_dump -f unit-4.dump -T pg_depend_save
 INSERT INTO pg_depend SELECT * FROM pg_depend_save;

unit--3--4.sql.in

@@ -0,0 +1,16 @@
+-- convert @ from (unit, cstring) to (unit, text)
+
+DROP OPERATOR @ (unit, cstring);
+DROP FUNCTION unit_at(unit, cstring);
+
+CREATE FUNCTION unit_at(unit, text)
+	RETURNS cstring
+	SET search_path = @extschema@
+	AS '$libdir/unit', 'unit_at_text'
+	LANGUAGE C IMMUTABLE STRICT;
+
+CREATE OPERATOR @ (
+	leftarg = unit,
+	rightarg = text,
+	procedure = unit_at
+);