Moves shared dependencies to SPI

partiql-ast/build.gradle.kts

@@ -23,6 +23,9 @@ dependencies {
     api(Deps.pigRuntime)
     api(Deps.ionElement)
     api(project(":partiql-types"))
+    // TODO REMOVE ME ONCE PartiQLValue IS REMOVED
+    // THE AST NEEDS ITS OWN "VALUE" REPRESENTATION
+    api(project(":partiql-spi"))
 }
 
 tasks.shadowJar {

partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt

@@ -27,7 +27,6 @@ import org.partiql.eval.PartiQLResult
 import org.partiql.plugins.memory.MemoryCatalog
 import org.partiql.plugins.memory.MemoryConnector
 import org.partiql.spi.connector.Connector
-import org.partiql.spi.connector.sql.info.InfoSchema
 import org.partiql.types.StaticType
 import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.io.PartiQLValueTextWriter
@@ -226,7 +225,6 @@ internal class MainCommand : Runnable {
         }
         val catalog = MemoryCatalog.builder()
             .name("default")
-            .info(InfoSchema.ext())
             .define(
                 name = "stdin",
                 type = StaticType.ANY,

partiql-eval/api/partiql-eval.api

@@ -63,48 +63,3 @@ public abstract interface class org/partiql/eval/PartiQLStatement {
 public abstract interface class org/partiql/eval/PartiQLStatement$Query : org/partiql/eval/PartiQLStatement {
 }
 
-public abstract interface class org/partiql/eval/value/Datum : java/lang/Iterable {
-	public static fun bagValue (Ljava/lang/Iterable;)Lorg/partiql/eval/value/Datum;
-	public static fun boolValue (Z)Lorg/partiql/eval/value/Datum;
-	public fun get (Ljava/lang/String;)Lorg/partiql/eval/value/Datum;
-	public fun getBigDecimal ()Ljava/math/BigDecimal;
-	public fun getBigInteger ()Ljava/math/BigInteger;
-	public fun getBoolean ()Z
-	public fun getByte ()B
-	public fun getBytes ()[B
-	public fun getDate ()Lorg/partiql/value/datetime/Date;
-	public fun getDouble ()D
-	public fun getFields ()Ljava/util/Iterator;
-	public fun getFloat ()F
-	public fun getInsensitive (Ljava/lang/String;)Lorg/partiql/eval/value/Datum;
-	public fun getInt ()I
-	public fun getInterval ()J
-	public fun getLong ()J
-	public fun getShort ()S
-	public fun getString ()Ljava/lang/String;
-	public fun getTime ()Lorg/partiql/value/datetime/Time;
-	public fun getTimestamp ()Lorg/partiql/value/datetime/Timestamp;
-	public abstract fun getType ()Lorg/partiql/types/PType;
-	public static fun int32Value (I)Lorg/partiql/eval/value/Datum;
-	public static fun int64Value (J)Lorg/partiql/eval/value/Datum;
-	public fun isMissing ()Z
-	public fun isNull ()Z
-	public fun iterator ()Ljava/util/Iterator;
-	public static fun listValue (Ljava/lang/Iterable;)Lorg/partiql/eval/value/Datum;
-	public static fun missingValue ()Lorg/partiql/eval/value/Datum;
-	public static fun missingValue (Lorg/partiql/types/PType;)Lorg/partiql/eval/value/Datum;
-	public static fun nullValue ()Lorg/partiql/eval/value/Datum;
-	public static fun nullValue (Lorg/partiql/types/PType;)Lorg/partiql/eval/value/Datum;
-	public static fun of (Lorg/partiql/value/PartiQLValue;)Lorg/partiql/eval/value/Datum;
-	public static fun sexpValue (Ljava/lang/Iterable;)Lorg/partiql/eval/value/Datum;
-	public static fun stringValue (Ljava/lang/String;)Lorg/partiql/eval/value/Datum;
-	public static fun structValue (Ljava/lang/Iterable;)Lorg/partiql/eval/value/Datum;
-	public fun toPartiQLValue ()Lorg/partiql/value/PartiQLValue;
-}
-
-public abstract interface class org/partiql/eval/value/Field {
-	public abstract fun getName ()Ljava/lang/String;
-	public abstract fun getValue ()Lorg/partiql/eval/value/Datum;
-	public static fun of (Ljava/lang/String;Lorg/partiql/eval/value/Datum;)Lorg/partiql/eval/value/Field;
-}
-

partiql-eval/build.gradle.kts

@@ -54,15 +54,6 @@ components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
     }
 }
 
-// Need to add this as we have both Java and Kotlin sources. Dokka already handles multi-language projects. If
-// Javadoc is enabled, we end up overwriting index.html (causing compilation errors).
-tasks.withType<Javadoc>() {
-    enabled = false
-}
-tasks.withType<Jar>() {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
 publish {
     artifactId = "partiql-eval"
     name = "PartiQL Lang Kotlin Evaluator"

partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/ValueUtility.kt

@@ -23,7 +23,7 @@ internal object ValueUtility {
 
     @OptIn(PartiQLValueExperimental::class)
     fun Datum.check(type: PartiQLValueType): Datum {
-        return this.check(PType.fromPartiQLValueType(type))
+        return this.check(type.toPType())
     }
 
     /**

partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCast.kt

@@ -64,7 +64,7 @@ internal class ExprCast(val arg: Operator.Expr, val cast: Ref.Cast) : Operator.E
         val argDatum = arg.eval(env)
         val arg = argDatum.toPartiQLValue()
         try {
-            val partiqlValue = when (PType.fromPartiQLValueType(arg.type).kind) {
+            val partiqlValue = when (arg.type.toPType().kind) {
                 PType.Kind.DYNAMIC -> TODO("Not Possible")
                 PType.Kind.BOOL -> castFromBool(arg as BoolValue, cast.target)
                 PType.Kind.TINYINT -> castFromNumeric(arg as Int8Value, cast.target)

partiql-plan/build.gradle.kts

@@ -21,6 +21,7 @@ plugins {
 }
 
 dependencies {
+    api(project(":partiql-spi"))
     api(project(":partiql-types"))
     implementation(Deps.ionElement)
     implementation(Deps.kotlinReflect)