Changeset: f6ee5784dca4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6ee5784dca4
Modified Files:
java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
sql/test/pg_regress/Tests/int8.stable.out
Branch: default
Log Message:
Corrected the output for non-int128 platforms
diffs (41 lines):
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
@@ -522,6 +522,10 @@ public class MonetStatement extends Mone
*/
@Override
public ResultSet executeQuery(String sql) throws SQLException {
+// for debug/trace enable:
+//if (sql != null && !sql.startsWith("SELECT 'demo' AS \"TABLE_CAT\",
\"schemas\".\"name\" AS \"TABLE_SCHEM\", \"tables\".\"name\" AS \"TABLE_NAME\",
\"columns\".\"name\" AS \"COLUMN_NAME\", cast(CASE \"columns\".\"type\" WHEN
'char' THEN 1"))
+// System.out.println("\n" + sql);
+
if (execute(sql) != true)
throw new SQLException("Query did not produce a result
set", "M1M19");
diff --git a/sql/test/pg_regress/Tests/int8.stable.out
b/sql/test/pg_regress/Tests/int8.stable.out
--- a/sql/test/pg_regress/Tests/int8.stable.out
+++ b/sql/test/pg_regress/Tests/int8.stable.out
@@ -90,13 +90,16 @@ Ready.
[ "", 4567890123456789, 123, 4567890123456666 ]
[ "", 4567890123456789, 4567890123456789, 0 ]
[ "", 4567890123456789, -4567890123456789, 9135780246913578 ]
-#SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL WHERE q2 <>
4567890123456789 ORDER BY q1, q2;
-% .L, sys.int8_tbl, sys.int8_tbl, sys.L # table_name
-% three, q1, q2, multiply # name
-% char, bigint, bigint, bigint # type
-% 0, 16, 16, 18 # length
-[ "", 123, 456, 56088 ]
-[ "", 4567890123456789, 123, 561850485185185047 ]
+#SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL
+# WHERE q1 < 1000 or (q2 > 0 and q2 < 1000);
+% ., sys.int8_tbl, sys.int8_tbl, sys. # table_name
+# .L, sys.int8_tbl, sys.int8_tbl, sys.L # table_name
+% three, q1, q2, multiply # name
+% char, bigint, bigint, bigint # type
+% 0, 16, 16, 18 # length
+[ "", 123, 456, 56088 ]
+[ "", 123, 4567890123456789, 561850485185185047 ]
+[ "", 4567890123456789, 123, 561850485185185047 ]
#SELECT '' AS five, q1, q2, q1 / q2 AS divide FROM INT8_TBL;
% .L, sys.int8_tbl, sys.int8_tbl, sys.L # table_name
% five, q1, q2, divide # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
