Changeset: 82c3aa76f31f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/82c3aa76f31f
Modified Files:
clients/odbc/driver/driver.rc
sql/test/rel-optimizers/Tests/merge-unions.test
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (truncated from 2778 to 300 lines):
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -27,7 +27,7 @@ BEGIN
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "MonetDB SQL Server\0"
+ VALUE "ProductName", "MonetDB ODBC Driver\0"
VALUE "ProductVersion", sversion(11,52,0)
VALUE "SpecialBuild", "\0"
END
diff --git
a/sql/backends/monet5/generator/Tests/execute-privilege-for-public-hge.test
b/sql/backends/monet5/generator/Tests/execute-privilege-for-public-hge.test
--- a/sql/backends/monet5/generator/Tests/execute-privilege-for-public-hge.test
+++ b/sql/backends/monet5/generator/Tests/execute-privilege-for-public-hge.test
@@ -3,21 +3,21 @@ statement ok
create user test with password 'test' name 'test'
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(cast(1 as hugeint),3)
----
1
2
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(1,cast(4 as hugeint),2)
----
1
3
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(5,1,cast(-2 as hugeint))
----
5
@@ -35,3 +35,4 @@ drop schema test
@connection(id=c1, username=monetdb, password=monetdb)
statement ok
drop user test
+
diff --git
a/sql/backends/monet5/generator/Tests/execute-privilege-for-public.test
b/sql/backends/monet5/generator/Tests/execute-privilege-for-public.test
--- a/sql/backends/monet5/generator/Tests/execute-privilege-for-public.test
+++ b/sql/backends/monet5/generator/Tests/execute-privilege-for-public.test
@@ -3,182 +3,182 @@ statement ok
create user test with password 'test' name 'test'
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(1,3)
----
1
2
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(1,4,2)
----
1
3
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(5,1,-2)
----
5
3
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(cast(1 as tinyint),3)
----
1
2
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(1,cast(4 as tinyint),2)
----
1
3
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(5,1,cast(-2 as tinyint))
----
5
3
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(cast(1 as smallint),3)
----
1
2
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(1,cast(4 as smallint),2)
----
1
3
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(5,1,cast(-2 as smallint))
----
5
3
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(cast(1 as int),3)
----
1
2
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(1,cast(4 as int),2)
----
1
3
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(5,1,cast(-2 as int))
----
5
3
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(cast(1 as bigint),3)
----
1
2
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(1,cast(4 as bigint),2)
----
1
3
@connection(id=c2, username=test, password=test)
-query I
+query I nosort
SELECT * from generate_series(5,1,cast(-2 as bigint))
----
5
3
@connection(id=c2, username=test, password=test)
-query R
+query R nosort
SELECT * from generate_series(cast(1 as real),3,1)
----
1.000
2.000
@connection(id=c2, username=test, password=test)
-query R
+query R nosort
SELECT * from generate_series(1,cast(4 as real),2)
----
1.000
3.000
@connection(id=c2, username=test, password=test)
-query R
+query R nosort
SELECT * from generate_series(5,1,cast(-2 as real))
----
5.000
3.000
@connection(id=c2, username=test, password=test)
-query R
+query R nosort
SELECT * from generate_series(cast(1 as double),3,1)
----
1.000
2.000
@connection(id=c2, username=test, password=test)
-query R
+query R nosort
SELECT * from generate_series(1,cast(4 as double),2)
----
1.000
3.000
@connection(id=c2, username=test, password=test)
-query R
+query R nosort
SELECT * from generate_series(5,1,cast(-2 as double))
----
5.000
3.000
@connection(id=c2, username=test, password=test)
-query R
+query R nosort
SELECT * from generate_series(cast(1 as decimal(9)),3,1)
----
1.000
2.000
@connection(id=c2, username=test, password=test)
-query R
+query R nosort
SELECT * from generate_series(1,cast(4 as decimal(9)),2)
----
1.000
3.000
@connection(id=c2, username=test, password=test)
-query R
+query R nosort
SELECT * from generate_series(5,1,cast(-2 as decimal(9)))
----
5.000
3.000
@connection(id=c2, username=test, password=test)
-query T
+query T nosort
SELECT * from generate_series(cast('2024-12-28' as date),cast('2024-12-31' as
date),cast('2' as interval day))
----
2024-12-28
2024-12-30
@connection(id=c2, username=test, password=test)
-query T
+query T nosort
SELECT * from generate_series(cast('2024-02-28' as date),cast('2024-12-31' as
date),cast('3' as interval month))
----
2024-02-28
@@ -186,14 +186,14 @@ 2024-05-28
2024-08-28
@connection(id=c2, username=test, password=test)
-query T
+query T nosort
SELECT * from generate_series(cast('2024-12-28' as
timestamp),cast('2024-12-31' as timestamp),cast('2' as interval day))
----
2024-12-28 00:00:00
2024-12-30 00:00:00
@connection(id=c2, username=test, password=test)
-query T
+query T nosort
SELECT * from generate_series(cast('2024-12-28' as timestamp),cast('2024-12-28
01:01:01' as timestamp),cast('1800' as interval second))
----
2024-12-28 00:00:00
@@ -212,3 +212,4 @@ drop schema test
@connection(id=c1, username=monetdb, password=monetdb)
statement ok
drop user test
+
diff --git a/sql/backends/monet5/sql_time.c b/sql/backends/monet5/sql_time.c
--- a/sql/backends/monet5/sql_time.c
+++ b/sql/backends/monet5/sql_time.c
@@ -951,7 +951,8 @@ month_interval_str_imp(int *ret, const c
lng upcast;
if (interval_from_str(next, d, sk, &upcast) < 0)
return createException(SQL, "batcalc.month_interval_str",
SQLSTATE(42000) "Wrong format (%s)", next);
- assert((lng) GDK_int_min <= upcast && upcast <= (lng) GDK_int_max);
+ if (upcast < (lng) GDK_int_min || upcast > (lng) GDK_int_max)
+ throw(SQL, "batcalc.month_interval_str", SQLSTATE(22003) "value
out of range");
*ret = (int) upcast;
return MAL_SUCCEED;
}
diff --git a/sql/test/2023/Tests/unique_nulls_distinct.test
b/sql/test/2023/Tests/unique_nulls_distinct.test
--- a/sql/test/2023/Tests/unique_nulls_distinct.test
+++ b/sql/test/2023/Tests/unique_nulls_distinct.test
@@ -1,4 +1,3 @@
-
statement ok
CREATE TABLE und1 (i1 int, i2 int, UNIQUE (i1, i2))
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
