Changeset: 04e74b36fc34 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/04e74b36fc34
Modified Files:
sql/jdbc/tests/Tests/OnClientDownloadData.sql
sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
Branch: Jan2022
Log Message:
Add LIMIT ### to ON CLIENT data export queries, such that it produces a
constant amout of rows in the data files which later will be imported.
On MS Windows the number of rows in sys.tables is less than on Linux producing
different outputs. Now the number of exported rows is specified.
diffs (32 lines):
diff --git a/sql/jdbc/tests/Tests/OnClientDownloadData.sql
b/sql/jdbc/tests/Tests/OnClientDownloadData.sql
--- a/sql/jdbc/tests/Tests/OnClientDownloadData.sql
+++ b/sql/jdbc/tests/Tests/OnClientDownloadData.sql
@@ -1,11 +1,11 @@
-- test ON CLIENT data exports with different delimiters
-COPY SELECT * FROM sys.tables ORDER BY id INTO 'sys_tables_by_id.dsv' ON
CLIENT;
-COPY SELECT * FROM sys.tables ORDER BY id INTO 'sys_tables_by_id.csv' ON
CLIENT USING DELIMITERS ',' , E'\n' , '"' NULL AS '';
-COPY SELECT * FROM sys.tables ORDER BY id INTO 'sys_tables_by_id.tsv' ON
CLIENT USING DELIMITERS E'\t' , E'\n' , '"' NULL AS '';
-COPY SELECT * FROM sys.tables ORDER BY id INTO 'sys_tables_by_id.psv' ON
CLIENT USING DELIMITERS '|' , E'\n' , '"' NULL AS '';
+COPY SELECT * FROM sys.tables ORDER BY id LIMIT 121 INTO
'sys_tables_by_id.dsv' ON CLIENT;
+COPY SELECT * FROM sys.tables ORDER BY id LIMIT 122 INTO
'sys_tables_by_id.csv' ON CLIENT USING DELIMITERS ',' , E'\n' , '"' NULL AS '';
+COPY SELECT * FROM sys.tables ORDER BY id LIMIT 123 INTO
'sys_tables_by_id.tsv' ON CLIENT USING DELIMITERS E'\t' , E'\n' , '"' NULL AS
'';
+COPY SELECT * FROM sys.tables ORDER BY id LIMIT 124 INTO
'sys_tables_by_id.psv' ON CLIENT USING DELIMITERS '|' , E'\n' , '"' NULL AS '';
-- and compressed exports (only .gz is supported)
-COPY SELECT * FROM sys.tables ORDER BY id INTO 'sys_tables_by_id.csv.gz' ON
CLIENT USING DELIMITERS ',' , E'\n' , '"' NULL AS '';
+COPY SELECT * FROM sys.tables ORDER BY id LIMIT 120 INTO
'sys_tables_by_id.csv.gz' ON CLIENT USING DELIMITERS ',' , E'\n' , '"' NULL AS
'';
-- test error handling
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
--- a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
@@ -103,7 +103,7 @@ if __name__ == '__main__':
if perr != "":
print(perr)
print("OnClientUploadData err difference detected")
- if pout != "Operation successful\nOperation successful\n129 affected
rows\n+-------+\n| %2 |\n+=======+\n| true |\n+-------+\n1 row\n129
affected rows\n129 affected rows\n+-------+\n| %2 |\n+=======+\n| true
|\n+-------+\n1 row\n129 affected rows\n20 affected rows\n+-------+\n| %2
|\n+=======+\n| true |\n+-------+\n1 row\n20 affected rows\n129 affected
rows\n+-------+\n| %2 |\n+=======+\n| true |\n+-------+\n1 row\n129
affected rows\n129 affected rows\n+-------+\n| %2 |\n+=======+\n| true
|\n+-------+\n1 row\n129 affected rows\n129 affected rows\n+-------+\n| %2
|\n+=======+\n| true |\n+-------+\n1 row\n129 affected rows\n80 affected
rows\n+-------+\n| %2 |\n+=======+\n| true |\n+-------+\n1 row\n80 affected
rows\nOperation successful\n":
+ if pout != "Operation successful\nOperation successful\n121 affected
rows\n+-------+\n| %2 |\n+=======+\n| true |\n+-------+\n1 row\n121
affected rows\n122 affected rows\n+-------+\n| %2 |\n+=======+\n| true
|\n+-------+\n1 row\n122 affected rows\n20 affected rows\n+-------+\n| %2
|\n+=======+\n| true |\n+-------+\n1 row\n20 affected rows\n123 affected
rows\n+-------+\n| %2 |\n+=======+\n| true |\n+-------+\n1 row\n123
affected rows\n124 affected rows\n+-------+\n| %2 |\n+=======+\n| true
|\n+-------+\n1 row\n124 affected rows\n120 affected rows\n+-------+\n| %2
|\n+=======+\n| true |\n+-------+\n1 row\n120 affected rows\n80 affected
rows\n+-------+\n| %2 |\n+=======+\n| true |\n+-------+\n1 row\n80 affected
rows\nOperation successful\n":
print(pout)
print("OnClientUploadData out difference detected")
except CalledProcessError as e:
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
