Add serialization of wrapped poly values

polypheny · Mar 20, 2024 · f74a3b9 · f74a3b9
1 parent 02344e3
commit f74a3b9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/main/java/org/polypheny/jdbc/jdbctypes/TypedValue.java b/src/main/java/org/polypheny/jdbc/jdbctypes/TypedValue.java
@@ -56,6 +56,7 @@
 import org.polypheny.jdbc.ProtoInterfaceServiceException;
 import org.polypheny.jdbc.deserialization.UDTPrototype;
 import org.polypheny.jdbc.nativetypes.PolyInterval;
+import org.polypheny.jdbc.nativetypes.PolyValue;
 import org.polypheny.jdbc.utils.TypedValueUtils;
 
 public class TypedValue implements Convertible {
@@ -97,8 +98,8 @@ public static TypedValue fromUdtPrototype( UDTPrototype udtPrototype ) {
     }
 
 
-    public static TypedValue fromInterval( PolyInterval interval ) {
-        return new TypedValue( interval, "INTERVAL" );
+    public static TypedValue fromPolyValue( PolyValue value ) {
+        return new TypedValue( value, value.type.name() );
     }
 
 
@@ -979,9 +980,7 @@ public Object asObject() throws SQLException {
             case Types.SQLXML:
                 return asSQLXML();
             case Types.OTHER:
-                if ( internalType.equals( "INTERVAL" ) ) {
-                    return value;
-                }
+                return value;
         }
         throw new IllegalArgumentException( "No conversion to object possible for jdbc type: " + getJdbcType() );
     }
@@ -1051,9 +1050,7 @@ public Object asObject( Calendar calendar ) throws SQLException {
             case Types.SQLXML:
                 return asSQLXML();
             case Types.OTHER:
-                if ( internalType.equals( "INTERVAL" ) ) {
-                    return value;
-                }
+                return value;
         }
         throw new IllegalArgumentException( "No conversion to object possible for jdbc type: " + getJdbcType() );
     }

diff --git a/src/main/java/org/polypheny/jdbc/serialisation/ProtoValueSerializer.java b/src/main/java/org/polypheny/jdbc/serialisation/ProtoValueSerializer.java
@@ -27,6 +27,7 @@
 import org.polypheny.jdbc.ProtoInterfaceServiceException;
 import org.polypheny.jdbc.jdbctypes.TypedValue;
 import org.polypheny.jdbc.nativetypes.PolyInterval;
+import org.polypheny.jdbc.nativetypes.PolyValue;
 import org.polypheny.jdbc.properties.DriverProperties;
 
 public class ProtoValueSerializer {
@@ -98,10 +99,10 @@ public static ProtoValue serialize( TypedValue typedValue ) throws SQLException
             case Types.NULL:
                 return serializeAsProtoNull();
             case Types.OTHER:
-                switch ( typedValue.getInternalType() ) {
-                    case "INTERVAL":
-                        return serializeInterval( typedValue );
+                if ( !(typedValue.getValue() instanceof PolyValue) ) {
+                    throw new RuntimeException( "Can't serialize unknown value!" );
                 }
+                return ((PolyValue) typedValue.getValue()).toProto();
                 break;
             case Types.JAVA_OBJECT:
                 // TODO TH: find something useful to do here...