Changeset: 2ddb22b88919 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2ddb22b88919
Modified Files:
sql/server/rel_select.c
sql/test/SQLancer/Tests/sqlancer21.SQL.py
sql/test/prepare/Tests/sqlancer_prepare.stable.out
sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
Branch: privfuncs
Log Message:
Cleaned leftover scale up/down references
diffs (54 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -1367,6 +1367,8 @@ exp_fix_scale(mvc *sql, sql_subtype *ct,
res->scale = (et->scale + scale_diff);
return exp_binop(sql->sa, swapped ? atom_exp :
e, swapped ? e : atom_exp, c);
+ } else {
+ TRC_CRITICAL(SQL_PARSER, "scale_down/up missing
(%s)\n", et->type->base.name);
}
}
} else if (always && et->scale) { /* scale down */
diff --git a/sql/test/SQLancer/Tests/sqlancer21.SQL.py
b/sql/test/SQLancer/Tests/sqlancer21.SQL.py
--- a/sql/test/SQLancer/Tests/sqlancer21.SQL.py
+++ b/sql/test/SQLancer/Tests/sqlancer21.SQL.py
@@ -24,10 +24,6 @@ with SQLTestCase() as cli:
.assertSucceeded().assertDataResultMatch([(Decimal('0.002'),)])
cli.execute("SELECT CAST(2 AS DECIMAL) & CAST(3 AS DOUBLE) FROM rt1 where
rt1.c0 = 1;") \
.assertSucceeded().assertDataResultMatch([(Decimal('0.002'),)])
- cli.execute("SELECT scale_down(146.0, 1) FROM t1 where t1.c0 = 1;") \
- .assertSucceeded().assertDataResultMatch([(Decimal('14.6'),)])
- cli.execute("SELECT scale_down(146.0, 1) FROM rt1 where rt1.c0 = 1;") \
- .assertSucceeded().assertDataResultMatch([(Decimal('14.6'),)])
cli.execute("SELECT greatest(\"lower\"('D4Idf '), 'x x') FROM t1 where
t1.c0 = 1;") \
.assertSucceeded().assertDataResultMatch([("x x",)])
cli.execute("SELECT greatest(\"lower\"('D4Idf '), 'x x') FROM rt1 where
rt1.c0 = 1;") \
diff --git a/sql/test/prepare/Tests/sqlancer_prepare.stable.out
b/sql/test/prepare/Tests/sqlancer_prepare.stable.out
--- a/sql/test/prepare/Tests/sqlancer_prepare.stable.out
+++ b/sql/test/prepare/Tests/sqlancer_prepare.stable.out
@@ -71,10 +71,6 @@
[ "double", 53, 17, "", "%2", "%2" ]
[ "char", 9, 0, NULL, NULL, NULL ]
[ "tinyint", 8, 0, NULL, NULL, NULL ]
-#PREPARE (SELECT DISTINCT ((CAST(- (CASE r'' WHEN r'tU1' THEN 1739172851 WHEN
? THEN -1313600539 WHEN r'X(' THEN NULL WHEN r')''CD' THEN 95 END) AS
BIGINT))&(least(- (-235253756), 64)))
-#WHERE ((rtrim(r'Z'))LIKE(r'rK'))) UNION ALL (SELECT ALL ? WHERE
(scale_down(ifthenelse(TRUE, 18, ?), r'4')) IS NULL);
-#PREPARE (SELECT DISTINCT ((CAST(- (CASE r'' WHEN r'tU1' THEN 1739172851 WHEN
? THEN -1313600539 WHEN r'X(' THEN NULL WHEN r')''CD' THEN 95 END) AS
BIGINT))&(least(- (-235253756), 64)))
-#WHERE ((rtrim(r'Z'))LIKE(r'rK'))) UNION ALL (SELECT ALL ? WHERE
(scale_down(ifthenelse(TRUE, 18, ?), r'4')) IS NULL);
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
diff --git a/sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
b/sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
--- a/sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
+++ b/sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
@@ -71,10 +71,6 @@
[ "double", 53, 17, "", "%2", "%2" ]
[ "char", 9, 0, NULL, NULL, NULL ]
[ "tinyint", 8, 0, NULL, NULL, NULL ]
-#PREPARE (SELECT DISTINCT ((CAST(- (CASE r'' WHEN r'tU1{D^㙝U' THEN 1739172851
WHEN ? THEN -1313600539 WHEN r'X(%4}' THEN NULL WHEN r')帘''舻CD' THEN 95 END)
AS BIGINT))&(least(- (-235253756), 64)))
-#WHERE ((rtrim(r'Z'))LIKE(r'rK'))) UNION ALL (SELECT ALL ? WHERE
(scale_down(ifthenelse(TRUE, 18, ?), r'4')) IS NULL);
-#PREPARE (SELECT DISTINCT ((CAST(- (CASE r'' WHEN r'tU1{D^㙝U' THEN 1739172851
WHEN ? THEN -1313600539 WHEN r'X(%4}' THEN NULL WHEN r')帘''舻CD' THEN 95 END)
AS BIGINT))&(least(- (-235253756), 64)))
-#WHERE ((rtrim(r'Z'))LIKE(r'rK'))) UNION ALL (SELECT ALL ? WHERE
(scale_down(ifthenelse(TRUE, 18, ?), r'4')) IS NULL);
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, varchar, varchar, varchar # type
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
