sql: adjust casts and tests for pg compatibility

Author: sploiselle

src/sql/src/plan/cast.rs

@@ -143,16 +143,10 @@ lazy_static! {
         casts! {
             // BOOL
             (Bool, Explicit(String)) => CastBoolToStringExplicit,
-            (Bool, Explicit(Jsonb)) => CastJsonbOrNullToJsonb,
             (Bool, JsonbAny) => CastJsonbOrNullToJsonb,
 
             //INT32
             (Int32, Explicit(Bool)) => CastInt32ToBool,
-            (Int32, Explicit(Jsonb)) => CastOp::F(|_ecx, e, _to_type| {
-                e
-                .call_unary(UnaryFunc::CastInt32ToFloat64)
-                .call_unary(UnaryFunc::CastJsonbOrNullToJsonb)
-            }),
             (Int32, Implicit(Int64)) => CastInt32ToInt64,
             (Int32, Implicit(Float32)) => CastInt32ToFloat32,
             (Int32, Implicit(Float64)) => CastInt32ToFloat64,
@@ -198,7 +192,6 @@ lazy_static! {
                 e.call_binary(s, BinaryFunc::CastFloat64ToDecimal)
             }),
             (Float64, Explicit(String)) => CastFloat64ToString,
-            (Float64, Explicit(Jsonb)) => CastJsonbOrNullToJsonb,
             (Float64, JsonbAny) => CastJsonbOrNullToJsonb,
 
             // DECIMAL

test/sqllogictest/type-promotion.slt

@@ -161,8 +161,8 @@ query error Cannot call function char_length\(i32\): arguments cannot be implici
 SELECT char_length(321);
 
 # Cannot implicitly cast string to any numeric category
-# query error no overload for string + string
-# SELECT 'dog'::text + 'cat'::text;
+query error no overload for string \+ string
+SELECT 'dog'::text + 'cat'::text;
 
 # Cannot implicitly cast f64 to decimal
 query error Cannot call function round\(f64, i32\): arguments cannot be implicitly cast to any implementation's parameters; try providing explicit casts
@@ -279,12 +279,17 @@ SELECT 2::int::bigint;
 query error CAST does not support casting from interval to i64
 SELECT '1'::interval::bigint
 
-# pginvalid
+#pginvalid
 query T
 SELECT '{}'::jsonb::bigint;
 ----
 NULL
 
+query R
+SELECT '1'::jsonb::bigint;
+----
+1
+
 query error invalid input syntax for int8: invalid digit found in string: "dog"
 SELECT 'dog'::text::bigint
 
@@ -297,13 +302,11 @@ SELECT '2002 03-04'::timestamp::bigint
 query error CAST does not support casting from timestamptz to i64
 SELECT '2003 04-05'::timestamptz::bigint
 
-# pginvalid
 query T
 SELECT 1::bigint::boolean;
 ----
 true
 
-# should be 't'
 query T
 SELECT TRUE::boolean::boolean;
 ----
@@ -321,7 +324,6 @@ SELECT 1.2::double::boolean
 query error CAST does not support casting from f64 to bool
 SELECT 1.3::real::boolean
 
-# should be 't'
 query T
 SELECT 2::int::boolean;
 ----
@@ -330,11 +332,17 @@ true
 query error CAST does not support casting from interval to bool
 SELECT '1'::interval::boolean
 
+#pginvalid
 query T
 SELECT '{}'::jsonb::boolean;
 ----
 NULL
 
+query T
+SELECT '1'::jsonb::boolean;
+----
+NULL
+
 query error invalid input syntax for bool: "dog"
 SELECT 'dog'::text::boolean
 
@@ -431,6 +439,11 @@ SELECT '{}'::jsonb::numeric;
 ----
 NULL
 
+query R
+SELECT '1'::jsonb::numeric;
+----
+1.0000
+
 query error invalid input syntax for decimal: malformed numeric literal: dog: "dog"
 SELECT 'dog'::text::numeric
 
@@ -477,11 +490,17 @@ SELECT 2::int::double;
 query error CAST does not support casting from interval to f64
 SELECT '1'::interval::double
 
+#pginvalid
 query T
 SELECT '{}'::jsonb::double;
 ----
 NULL
 
+query T
+SELECT '1'::jsonb::double;
+----
+1.000
+
 query error invalid input syntax for float8: invalid float literal: "dog"
 SELECT 'dog'::text::double
 
@@ -528,11 +547,17 @@ SELECT 2::int::real;
 query error CAST does not support casting from interval to f64
 SELECT '1'::interval::real
 
+#pginvalid
 query T
 SELECT '{}'::jsonb::real;
 ----
 NULL
 
+query R
+SELECT '2'::jsonb::real;
+----
+2.000
+
 query error invalid input syntax for float8: invalid float literal: "dog"
 SELECT 'dog'::text::real
 
@@ -579,11 +604,17 @@ SELECT 2::int::integer;
 query error CAST does not support casting from interval to i32
 SELECT '1'::interval::integer
 
+#pginvalid
 query T
 SELECT '{}'::jsonb::integer;
 ----
 NULL
 
+query R
+SELECT '1'::jsonb::integer;
+----
+1
+
 query error invalid input syntax for int4: invalid digit found in string: "dog"
 SELECT 'dog'::text::integer
 
@@ -642,40 +673,36 @@ SELECT '2003 04-05'::timestamptz::interval
 query error CAST does not support casting from i64 to jsonb
 SELECT 1::bigint::jsonb
 
-query T
+#pginvalid
+query error CAST does not support casting from bool to jsonb
 SELECT TRUE::boolean::jsonb;
-----
-true
 
 query error CAST does not support casting from date to jsonb
 SELECT '2001 02-03'::date::jsonb
 
 query error CAST does not support casting from decimal\(38, 0\) to jsonb
 SELECT 1.1::numeric::jsonb
 
-query T
+query error CAST does not support casting from f64 to jsonb
 SELECT 1.2::double::jsonb;
-----
-1.2
 
-query T
-SELECT 1.3::real::jsonb;
-----
-1.3
-
-query T
+query error CAST does not support casting from i32 to jsonb
 SELECT 2::int::jsonb;
-----
-2.0
 
 query error CAST does not support casting from interval to jsonb
 SELECT '1'::interval::jsonb
 
 query T
 SELECT '{}'::jsonb::jsonb;
 ----
- {}
+{}
+
+query T
+SELECT '1'::jsonb::jsonb;
+----
+1.0
 
+#pginvalid
 query T
 SELECT 'dog'::text::jsonb;
 ----
@@ -735,6 +762,11 @@ SELECT '{}'::jsonb::text;
 ----
 {}
 
+query T
+SELECT '1'::jsonb::text;
+----
+1.0
+
 query T
 SELECT 'dog'::text::text;
 ----