MonetDB: Jul2015 - Use strtoll to read values of type lng.

[Sjoerd Mullender]

Changeset: 05ff5af92e76 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05ff5af92e76
Modified Files:
        sql/server/sql_datetime.c
        sql/test/pg_regress/Tests/interval.stable.err
        sql/test/pg_regress/Tests/interval.stable.out
Branch: Jul2015
Log Message:

Use strtoll to read values of type lng.


diffs (63 lines):

diff --git a/sql/server/sql_datetime.c b/sql/server/sql_datetime.c
--- a/sql/server/sql_datetime.c
+++ b/sql/server/sql_datetime.c
@@ -118,7 +118,7 @@ parse_interval_(mvc *sql, lng sign, char
                return -1;
        }
 
-       val = strtol(str, &n, 10);
+       val = strtoll(str, &n, 10);
        if (!n)
                return -1;
        if (sk == isec) {
@@ -222,7 +222,7 @@ parse_interval(mvc *sql, lng sign, char 
                return -1;
        }
 
-       val = strtol(str, &n, 10);
+       val = strtoll(str, &n, 10);
        if (!n)
                return -1;
        if (sk == isec) {
diff --git a/sql/test/pg_regress/Tests/interval.stable.err 
b/sql/test/pg_regress/Tests/interval.stable.err
--- a/sql/test/pg_regress/Tests/interval.stable.err
+++ b/sql/test/pg_regress/Tests/interval.stable.err
@@ -114,14 +114,17 @@ ERROR = !types sec_interval(13,0) and do
 MAPI  = (monetdb) /var/tmp/mtest-21889/.s.monetdb.34286
 QUERY = select avg(cast(f1 as double)) from interval_tbl;
 ERROR = !types sec_interval(13,0) and double(53,0) are not equal for column 
'f1'
-MAPI  = (monetdb) /var/tmp/mtest-21889/.s.monetdb.34286
+MAPI  = (monetdb) /var/tmp/mtest-11560/.s.monetdb.36606
+QUERY = select avg(cast(f1 as decimal)) from interval_tbl;
+ERROR = !too many digits (22 > 18)
+MAPI  = (monetdb) /var/tmp/mtest-11560/.s.monetdb.36606
 QUERY = select avg(cast(f1 as decimal(22,3))) from interval_tbl;
 ERROR = !decimal(22,3) isn't supported because P=22 > 18 in: "select 
avg(cast(f1 as decimal(22,3)"
-        !syntax/parse error, 
-MAPI  = (monetdb) /var/tmp/mtest-21889/.s.monetdb.34286
+        !syntax error, unexpected ')' in: ")"
+MAPI  = (monetdb) /var/tmp/mtest-11560/.s.monetdb.36606
 QUERY = select sum(cast(f1 as decimal(22,3))) from interval_tbl;
 ERROR = !decimal(22,3) isn't supported because P=22 > 18 in: "select 
sum(cast(f1 as decimal(22,3)"
-        !syntax/parse error, 
+        !syntax error, unexpected ')' in: ")"
 
 # 15:52:24 >  
 # 15:52:24 >  "Done."
diff --git a/sql/test/pg_regress/Tests/interval.stable.out 
b/sql/test/pg_regress/Tests/interval.stable.out
--- a/sql/test/pg_regress/Tests/interval.stable.out
+++ b/sql/test/pg_regress/Tests/interval.stable.out
@@ -80,13 +80,6 @@ Ready.
 [ "",  -1.000  ]
 [ "",  -1363962815083169.272   ]
 [ "",  -5670419503621183.312   ]
-#select avg(cast(f1 as decimal)) from interval_tbl;
-% sys. # table_name
-# sys.L2 # table_name
-% L2 # name
-% double # type
-% 24 # length
-[ 1.399119099e+13       ]
 #select min(f1) from interval_tbl;
 % sys.L1 # table_name
 % L1 # name
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list