Uses INT and BIGINT as default 32-bit and 64-bit integer names

src/main/kotlin/org/partiql/scribe/ScribeCompiler.kt

@@ -1,6 +1,9 @@
 package org.partiql.scribe
 
+import org.partiql.ast.AstNode
 import org.partiql.ast.Statement
+import org.partiql.ast.Type
+import org.partiql.ast.util.AstRewriter
 import org.partiql.errors.Problem
 import org.partiql.errors.ProblemCallback
 import org.partiql.errors.ProblemSeverity
@@ -40,7 +43,16 @@ public class ScribeCompiler internal constructor(
         session: PartiQLPlanner.Session,
     ): Scribe.Result<T> {
         try {
-            val ast = parse(statement)
+            var ast = parse(statement)
+
+            // TODO: REMOVE ME
+            //  PartiQL came from Ion SQL which uses the INT name for the unbounded integer.
+            //  In SQL, the INT name must have some finite precision and most systems use a 32-bit integer.
+            //  Scribe is built to interface with other systems, so we must change all occurrences of the INT
+            //  type name with INT4. In short, all systems do INT = INT4 but PartiQL has INT4 != INT.
+            //  >>>> ISSUE — https://github.com/partiql/partiql-lang-kotlin/issues/1471
+            ast = replaceIntWithInt4(ast)
+
             val plan = plan(ast, session)
             return scribe.compile(plan, target)
         } catch (e: ScribeException) {
@@ -78,4 +90,14 @@ public class ScribeCompiler internal constructor(
         @JvmStatic
         public fun builder(): ScribeCompilerBuilder = ScribeCompilerBuilder()
     }
+
+    /**
+     * Rewrite all occurrences of INT with INT4.
+     */
+    private fun replaceIntWithInt4(ast: Statement): Statement {
+        val rewriter = object : AstRewriter<Unit>() {
+            override fun visitTypeInt(node: Type.Int, ctx: Unit): AstNode = Type.Int4()
+        }
+        return rewriter.visitStatement(ast, Unit) as Statement
+    }
 }

src/main/kotlin/org/partiql/scribe/sql/SqlCalls.kt

@@ -16,6 +16,7 @@ import org.partiql.ast.exprUnary
 import org.partiql.ast.identifierSymbol
 import org.partiql.ast.typeAny
 import org.partiql.ast.typeBag
+import org.partiql.ast.typeBigint
 import org.partiql.ast.typeBlob
 import org.partiql.ast.typeBool
 import org.partiql.ast.typeChar
@@ -33,6 +34,7 @@ import org.partiql.ast.typeList
 import org.partiql.ast.typeMissing
 import org.partiql.ast.typeNullType
 import org.partiql.ast.typeSexp
+import org.partiql.ast.typeSmallint
 import org.partiql.ast.typeString
 import org.partiql.ast.typeStruct
 import org.partiql.ast.typeSymbol
@@ -287,9 +289,9 @@ public abstract class SqlCalls {
             PartiQLValueType.ANY -> typeAny()
             PartiQLValueType.BOOL -> typeBool()
             PartiQLValueType.INT8 -> typeInt()
-            PartiQLValueType.INT16 -> typeInt2()
-            PartiQLValueType.INT32 -> typeInt4()
-            PartiQLValueType.INT64 -> typeInt8()
+            PartiQLValueType.INT16 -> typeSmallint()
+            PartiQLValueType.INT32 -> typeInt()
+            PartiQLValueType.INT64 -> typeBigint()
             PartiQLValueType.INT -> typeInt()
             PartiQLValueType.DECIMAL_ARBITRARY -> typeDecimal(null, null)
             PartiQLValueType.DECIMAL -> typeDecimal(null, null)
@@ -327,9 +329,9 @@ public abstract class SqlCalls {
             PartiQLValueType.ANY -> typeAny()
             PartiQLValueType.BOOL -> typeBool()
             PartiQLValueType.INT8 -> error("unsupported")
-            PartiQLValueType.INT16 -> typeInt2()
-            PartiQLValueType.INT32 -> typeInt4()
-            PartiQLValueType.INT64 -> typeInt8()
+            PartiQLValueType.INT16 -> typeSmallint()
+            PartiQLValueType.INT32 -> typeInt()
+            PartiQLValueType.INT64 -> typeBigint()
             PartiQLValueType.INT -> typeInt()
             PartiQLValueType.DECIMAL_ARBITRARY -> typeDecimal(null, null)
             PartiQLValueType.DECIMAL -> typeDecimal(typeArg0?.toInt(), typeArg1?.toInt())

src/test/resources/inputs/operators/cast.sql

@@ -1,5 +1,11 @@
 --#[cast-00]
-CAST('1' AS INT4);
+CAST('1' AS INT);
 
 --#[cast-01]
-SELECT CAST('foo' AS STRING) AS s FROM T;
+CAST('1' AS INT4);
+
+--#[cast-02]
+CAST('1' AS INT8);
+
+--#[cast-03]
+CAST('1' AS BIGINT);

src/test/resources/outputs/partiql/basics/simple.sql

@@ -77,22 +77,26 @@ NOT ("default"."T1" IS NULL);
 NOT ("default"."T1" IS MISSING);
 
 --#[expr-14]
-"default"."T1" IS INT2;
+"default"."T1" IS SMALLINT;
 
 --#[expr-15]
-NOT ("default"."T1" IS INT2);
+NOT ("default"."T1" IS SMALLINT);
 
 --#[expr-16]
-"default"."T1" IS INT4;
+-- TODO USE INT as the default INT4 name.
+"default"."T1" IS INT;
 
 --#[expr-17]
-NOT ("default"."T1" IS INT4);
+-- TODO USE INT as the default INT4 name.
+NOT ("default"."T1" IS INT);
 
 --#[expr-18]
-"default"."T1" IS INT8;
+-- TODO USE BIGINT as the default BIGINT/INT8 name.
+"default"."T1" IS BIGINT;
 
 --#[expr-19]
-NOT ("default"."T1" IS INT8);
+-- TODO USE BIGINT as the default BIGINT/INT8 name.
+NOT ("default"."T1" IS BIGINT);
 
 --#[expr-20]
 "default"."T1" IS INT;

src/test/resources/outputs/partiql/operators/cast.sql

@@ -1,5 +1,11 @@
 --#[cast-00]
-CAST('1' AS INT4);
+CAST('1' AS INT);
 
 --#[cast-01]
-SELECT CAST('foo' AS STRING) AS "s" FROM "default"."T" AS "T";
+CAST('1' AS INT);
+
+--#[cast-02]
+CAST('1' AS BIGINT);
+
+--#[cast-03]
+CAST('1' AS BIGINT);

src/test/resources/outputs/redshift/operators/cast.sql

@@ -1,5 +1,11 @@
 --#[cast-00]
-CAST('1' AS INT4);
+CAST('1' AS INT);
 
 --#[cast-01]
-SELECT CAST('foo' AS VARCHAR) AS "s" FROM "default"."T" AS "T";
+CAST('1' AS INT);
+
+--#[cast-02]
+CAST('1' AS BIGINT);
+
+--#[cast-03]
+CAST('1' AS BIGINT);

src/test/resources/outputs/spark/operators/cast.sql

@@ -1,5 +1,11 @@
-----#[cast-00]
---CAST('1' AS INT4);
+-- #[cast-00]
+-- SELECT CAST('1' AS INT);
 
---#[cast-01]
-SELECT CAST('foo' AS STRING) AS `s` FROM `default`.`T` AS `T`;
+-- #[cast-01]
+-- SELECT CAST('1' AS INT);
+
+-- #[cast-02]
+-- SELECT CAST('1' AS BIGINT);
+
+-- #[cast-03]
+-- SELECT CAST('1' AS BIGINT);

src/test/resources/outputs/trino/operators/cast.sql

@@ -1,5 +1,11 @@
-----#[cast-00]
---CAST('1' AS INT4);
+--#[cast-00]
+CAST('1' AS INT);
 
 --#[cast-01]
-SELECT CAST('foo' AS VARCHAR) AS "s" FROM "default"."T" AS "T";
+CAST('1' AS INT);
+
+--#[cast-02]
+CAST('1' AS BIGINT);
+
+--#[cast-03]
+CAST('1' AS BIGINT);