Changeset: ce58aeade8c6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce58aeade8c6
Modified Files:
monetdb5/modules/atoms/mtime.c
sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.err.Windows
sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.out.Windows
Branch: Oct2014
Log Message:
Windows does support strftime (+ fix error message that is now not used).
diffs (69 lines):
diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -3462,6 +3462,6 @@ MTIMEstrftime(str *s, const date *d, con
strncpy(*s, buf, sz + 1);
return MAL_SUCCEED;
#else
- throw(MAL, "mtime.str_to_date", "strptime support missing");
+ throw(MAL, "mtime.str_to_date", "strftime support missing");
#endif
}
diff --git
a/sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.err.Windows
b/sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.err.Windows
---
a/sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.err.Windows
+++
b/sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.err.Windows
@@ -30,18 +30,12 @@ stderr of test 'date_script_test.Bug-297
# 14:12:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36122"
# 14:12:34 >
-MAPI = monetdb@LAB03:39057
+MAPI = monetdb@LAB03:34616
QUERY = select str_to_date('12-01-01','%y-%m-%d');
ERROR = !strptime support missing
-MAPI = monetdb@LAB03:39057
+MAPI = monetdb@LAB03:34616
QUERY = select str_to_date('2012-01-01','%Y-%m-%d');
ERROR = !strptime support missing
-MAPI = monetdb@LAB03:39057
-QUERY = select date_to_str('2012-02-11','%y/%m/%d');
-ERROR = !strptime support missing
-MAPI = monetdb@LAB03:39057
-QUERY = select date_to_str('2012-02-11','%Y/%m/%d');
-ERROR = !strptime support missing
# 14:12:34 >
# 14:12:34 > "Done."
diff --git
a/sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.out.Windows
b/sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.out.Windows
---
a/sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.out.Windows
+++
b/sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.out.Windows
@@ -19,12 +19,24 @@ stdout of test 'date_script_test.Bug-297
Ready.
-# 14:12:34 >
-# 14:12:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36122"
-# 14:12:34 >
+# 14:25:48 >
+# 14:25:48 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=LAB03"
"--port=34616"
+# 14:25:48 >
+#select date_to_str('2012-02-11','%y/%m/%d');
+% .L # table_name
+% date_to_str_single_value # name
+% clob # type
+% 8 # length
+[ "12/02/11" ]
+#select date_to_str('2012-02-11','%Y/%m/%d');
+% .L # table_name
+% date_to_str_single_value # name
+% clob # type
+% 10 # length
+[ "2012/02/11" ]
-# 14:12:34 >
-# 14:12:34 > "Done."
-# 14:12:34 >
+# 14:25:49 >
+# 14:25:49 > "Done."
+# 14:25:49 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
