Changeset: c3a9dbb758fe for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c3a9dbb758fe Modified Files: sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.bat sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.sh sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.bat sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.sh Branch: default Log Message:
merged with Oct2020 diffs (67 lines): diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All --- a/sql/jdbc/tests/Tests/All +++ b/sql/jdbc/tests/Tests/All @@ -14,7 +14,6 @@ HAVE_JDBCTESTS?BugDecimalRound_Bug_3561 HAVE_JDBCTESTS?BugResultSetMetaData_Bug_6183 HAVE_JDBCTESTS?Bug_PrepStmtSetObject_CLOB_6349 HAVE_JDBCTESTS?Bug_Connect_as_voc_getMetaData_Failure_Bug_6388 -HAVE_JDBCTESTS?Bug_PrepStmtSetString_6382 HAVE_JDBCTESTS?Bug_LargeQueries_6571_6693 HAVE_JDBCTESTS?Bug_IsValid_Timeout_Bug_6782 HAVE_JDBCTESTS?Bug_PrepStmt_With_Errors_Jira292 diff --git a/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat b/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat deleted file mode 100755 --- a/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat +++ /dev/null @@ -1,1 +0,0 @@ -@call "%TSTSRCDIR%\Test.SQL.bat" %* diff --git a/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh b/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh deleted file mode 100755 --- a/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -$TSTSRCDIR/Test.SQL.sh $* diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat --- a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat +++ b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat @@ -5,11 +5,11 @@ echo password=monetdb>> .monetdb prompt # $t $g -java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" --help +java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" --help -java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" -f "%TSTSRCBASE%\%TSTDIR%\Tests\JdbcClient_create_tables.sql" -java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" -f "%TSTSRCBASE%\%TSTDIR%\Tests\JdbcClient_inserts_selects.sql" -java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" -D -java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" -f "%TSTSRCBASE%\%TSTDIR%\Tests\JdbcClient_drop_tables.sql" +java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" -f "%TSTSRCBASE%\%TSTDIR%\Tests\JdbcClient_create_tables.sql" +java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" -f "%TSTSRCBASE%\%TSTDIR%\Tests\JdbcClient_inserts_selects.sql" +java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" -D +java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" -f "%TSTSRCBASE%\%TSTDIR%\Tests\JdbcClient_drop_tables.sql" @del .monetdb diff --git a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.bat b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.bat --- a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.bat +++ b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.bat @@ -5,6 +5,6 @@ echo password=monetdb>> .monetdb prompt # $t $g -call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f "%TSTSRCBASE%\%TSTDIR%\Tests\ValidateSystemCatalogTables.sql" +call java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f "%TSTSRCBASE%\%TSTDIR%\Tests\ValidateSystemCatalogTables.sql" @del .monetdb diff --git a/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.bat b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.bat --- a/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.bat +++ b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.bat @@ -5,6 +5,6 @@ echo password=monetdb>> .monetdb prompt # $t $g -call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f "%TSTSRCBASE%\%TSTDIR%\Tests\bogus-auto-generated-keys.sql" +call java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f "%TSTSRCBASE%\%TSTDIR%\Tests\bogus-auto-generated-keys.sql" @del .monetdb _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
