Take advantage of new @cast annotation

Author: jcflack

java/pom.xml

@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>pljava-api</artifactId>
-			<version>1.6.0</version>
+			<version>1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

java/src/main/java/com/invariantproperties/udt/sql/ComplexUDT.java

@@ -30,7 +30,9 @@
 import java.util.ResourceBundle;
 
 import org.postgresql.pljava.annotation.BaseUDT;
+import org.postgresql.pljava.annotation.Cast;
 import org.postgresql.pljava.annotation.Function;
+import static org.postgresql.pljava.annotation.Cast.Application.ASSIGNMENT;
 import static
     org.postgresql.pljava.annotation.Function.OnNullInput.RETURNS_NULL;
 import static org.postgresql.pljava.annotation.Function.Effects.IMMUTABLE;
@@ -225,6 +227,7 @@ public String toString() {
      */
     @Function(schema="invariantproperties", name="complex_string_as_complex",
         effects=IMMUTABLE, onNullInput=RETURNS_NULL)
+    @Cast(application=ASSIGNMENT)
     public static ComplexUDT newInstance(String input) throws SQLException {
         if (input == null) {
             return null;
@@ -241,6 +244,7 @@ public static ComplexUDT newInstance(String input) throws SQLException {
      */
     @Function(schema="invariantproperties", name="complex_double_as_complex",
         effects=IMMUTABLE, onNullInput=RETURNS_NULL)
+    @Cast(application=ASSIGNMENT)
     public static ComplexUDT newInstance(double value) throws SQLException {
         return new ComplexUDT(value);
     }
@@ -256,6 +260,7 @@ public static ComplexUDT newInstance(double value) throws SQLException {
     @Function(schema="invariantproperties",
         name="complex_bigdecimal_as_complex",
         effects=IMMUTABLE, onNullInput=RETURNS_NULL)
+    @Cast(application=ASSIGNMENT)
     public static ComplexUDT newInstance(BigDecimal value) throws SQLException {
         return new ComplexUDT(value.doubleValue());
     }
@@ -269,6 +274,7 @@ public static ComplexUDT newInstance(BigDecimal value) throws SQLException {
      */
     @Function(schema="invariantproperties", name="complex_int_as_complex",
         effects=IMMUTABLE, onNullInput=RETURNS_NULL)
+    @Cast(application=ASSIGNMENT)
     public static ComplexUDT newInstance(int value) throws SQLException {
         return new ComplexUDT(value);
     }
@@ -282,6 +288,7 @@ public static ComplexUDT newInstance(int value) throws SQLException {
      */
     @Function(schema="invariantproperties", name="complex_long_as_complex",
         effects=IMMUTABLE, onNullInput=RETURNS_NULL)
+    @Cast(application=ASSIGNMENT)
     public static ComplexUDT newInstance(long value) throws SQLException {
         return new ComplexUDT(value);
     }

java/src/main/java/com/invariantproperties/udt/sql/RationalUDT.java

@@ -29,9 +29,11 @@
 import java.util.ResourceBundle;
 
 import org.postgresql.pljava.annotation.BaseUDT;
+import org.postgresql.pljava.annotation.Cast;
 import org.postgresql.pljava.annotation.Function;
 import org.postgresql.pljava.annotation.SQLAction;
 import org.postgresql.pljava.annotation.SQLActions;
+import static org.postgresql.pljava.annotation.Cast.Application.ASSIGNMENT;
 import static
     org.postgresql.pljava.annotation.Function.OnNullInput.RETURNS_NULL;
 import static org.postgresql.pljava.annotation.Function.Effects.IMMUTABLE;
@@ -69,28 +71,6 @@
             "DROP AGGREGATE max(invariantproperties.rational)",
             "DROP AGGREGATE min(invariantproperties.rational)"
         }
-    ),
-    @SQLAction(
-        requires={"rationalfromstring", "rationalfromint", "rationalfromlong"},
-        install={
-            "CREATE CAST (varchar AS invariantproperties.rational) " +
-            "WITH FUNCTION " +
-	    "invariantproperties.rational_string_as_rational(varchar)" +
-            "AS ASSIGNMENT",
-
-            "CREATE CAST (int4 AS invariantproperties.rational) " +
-            "WITH FUNCTION invariantproperties.rational_int_as_rational(int4)" +
-            "AS ASSIGNMENT",
-
-            "CREATE CAST (int8 AS invariantproperties.rational) " +
-            "WITH FUNCTION invariantproperties.rational_long_as_rational(int8)"+
-            "AS ASSIGNMENT"
-        },
-        remove={
-	    "DROP CAST (int8 AS invariantproperties.rational)",
-	    "DROP CAST (int4 AS invariantproperties.rational)",
-	    "DROP CAST (varchar AS invariantproperties.rational)"
-        }
     )
 })
 public class RationalUDT implements SQLData {
@@ -441,8 +421,8 @@ public static boolean greaterThan(RationalUDT p, double q) {
      * @throws SQLException
      */
     @Function(schema="invariantproperties", name="rational_string_as_rational",
-        provides="rationalfromstring",
         effects=IMMUTABLE, onNullInput=RETURNS_NULL)
+    @Cast(application=ASSIGNMENT)
     public static RationalUDT newInstance(String input) throws SQLException {
         if (input == null) {
             return null;
@@ -458,8 +438,8 @@ public static RationalUDT newInstance(String input) throws SQLException {
      * @throws SQLException
      */
     @Function(schema="invariantproperties", name="rational_int_as_rational",
-        provides="rationalfromint",
         effects=IMMUTABLE, onNullInput=RETURNS_NULL)
+    @Cast(application=ASSIGNMENT)
     public static RationalUDT newInstance(int value) throws SQLException {
         return new RationalUDT(value);
     }
@@ -472,8 +452,8 @@ public static RationalUDT newInstance(int value) throws SQLException {
      * @throws SQLException
      */
     @Function(schema="invariantproperties", name="rational_long_as_rational",
-        provides="rationalfromlong",
         effects=IMMUTABLE, onNullInput=RETURNS_NULL)
+    @Cast(application=ASSIGNMENT)
     public static RationalUDT newInstance(long value) throws SQLException {
         return new RationalUDT(value);
     }

java/src/main/resources/postgresql-udt.ddr

@@ -276,34 +276,9 @@ SQLActions[] = {
       );
       */
 
-    CREATE CAST (varchar AS invariantproperties.complex)
-      WITH FUNCTION invariantproperties.complex_string_as_complex(varchar)
-      AS ASSIGNMENT;
-
-    CREATE CAST (numeric AS invariantproperties.complex)
-      WITH FUNCTION invariantproperties.complex_bigdecimal_as_complex(numeric)
-      AS ASSIGNMENT;
-
-    CREATE CAST (float8 AS invariantproperties.complex)
-      WITH FUNCTION invariantproperties.complex_double_as_complex(float8)
-      AS ASSIGNMENT;
-
-    CREATE CAST (int4 AS invariantproperties.complex)
-      WITH FUNCTION invariantproperties.complex_int_as_complex(int4)
-      AS ASSIGNMENT;
-
-    CREATE CAST (int8 AS invariantproperties.complex)
-      WITH FUNCTION invariantproperties.complex_long_as_complex(int8)
-      AS ASSIGNMENT;
-
    END INSTALL",
 
    "BEGIN REMOVE
-    DROP CAST (int8 AS invariantproperties.complex);
-    DROP CAST (int4 AS invariantproperties.complex);
-    DROP CAST (float8 AS invariantproperties.complex);
-    DROP CAST (numeric AS invariantproperties.complex);
-    DROP CAST (varchar AS invariantproperties.complex);
     /* DROP OPERATOR / ( invariantproperties.complex, invariantproperties.complex ); */
     DROP OPERATOR * ( numeric, invariantproperties.complex );
     DROP OPERATOR * ( float8, invariantproperties.complex );