Update of /cvsroot/monetdb/sql/src/test/BugTracker/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14066/sql/src/test/BugTracker/Tests
Modified Files:
Tag: SQL_2-24
All authorization.SF-1430616.SQL.bat
authorization.SF-1430616.SQL.sh
drop_schema_crash.SF-1504794.SQL.bat
drop_schema_crash.SF-1504794.SQL.sh explain.SF-1739353.SQL.bat
explain.SF-1739353.SQL.sh jdbc_no_debug.SF-1739356.SQL.bat
jdbc_no_debug.SF-1739356.SQL.sh
Log Message:
Clean-up of buildtools-, configure-, and testing-legacy in MonetDB-Java.
(
Considered as "bug-fix" by Sjoerd and me.
Has no impact on binary distributions and/or packaging.
Wrapped in tags "JavaTestingCleanUp1_before" & "JavaTestingCleanUp1_after".
Will fix or undo tomorrow in case unexpected problems occur.
)
- Removed "mjclient" as is was not packaged/distributed, anyway.
- Changed test that used "mjclient" to use "jdbcclient.jar" directly.
(Note: "jdbcclient.jar" is not packaged and/or distributed, either, but
only used internally for testing and "convenience".)
- Removed "monetdb-java-config[.bat]" as it was not packaged/distributed,
anyway.
- Changed Mtest.py (and tests) that used monetdb-java-config to find out
where the MonetDB/Java .jar's (and Java/JDBC tests) are installed,
to extract this information from CLASSPATH (falling back to
`monetdb-config --pkgdatadir`/lib and `monetdb-config --pkgdatadir`/Tests
in case CLASSPATH is not set accordingly, assuming MonetDB/Java is stalled
in the same prefix as MonetDB/Common).
- Removed all(?) code that became unused after above changes.
These changes should not break or add any inter-package/-module
dependencies.
TODO (Any help by any Java expert is more than welcome!):
====
For convenience of testing Java/JDBC functionality of binary distributions,
the tests in source/java/tests/ (installed in
<prefix>/share/MonetDB/Tests/*.class) should be collected in a single
"jdbctests.jar" (or alike) to be installed in <prefix>/share/MonetDB/Tests/
or <prefix>/share/MonetDB/lib/ (like the other *.jar files).
If necessary, the tests in sql/src/jdbc/tests/Tests/ then need to be adapted
to use the "jdbctests.jar" instead of the individual
<prefix>/share/MonetDB/Tests/*.class .
Just like "jdbcclient.jar", "jdbctests.jar" is meant for (internal) testing
convenience, only, and not to be distributed.
Index: All
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/BugTracker/Tests/All,v
retrieving revision 1.93.2.14
retrieving revision 1.93.2.15
diff -u -d -r1.93.2.14 -r1.93.2.15
--- All 30 Jun 2008 15:49:41 -0000 1.93.2.14
+++ All 1 Jul 2008 15:06:40 -0000 1.93.2.15
@@ -14,11 +14,11 @@
rows_affected.SF-1377180
broken_join.SF-1373391
insert_not_exists.SF-1380287
-HAVE_MONETDB_JAVAJDBC?authorization.SF-1430616
+HAVE_JDBCCLIENT_JAR?authorization.SF-1430616
mapi_connect_errors_vanish.SF-1432134
create_column_name_data.SF-1440214
HAVE_MONETDB4?connect_crash.SF-1436626
-HAVE_MONETDB_JAVAJDBC?drop_schema_crash.SF-1504794
+HAVE_JDBCCLIENT_JAR?drop_schema_crash.SF-1504794
set_session_vars.SF-1505987
reset_session_vars.SF-1505987
cast_interval2time.SF-1488247
@@ -76,11 +76,11 @@
update_fkey_with_value_not_in_the_pkey.SF-1734143
alter_table_add_fkey.SF-1737668
select_id_not_in_another_select.SF-1737777
-HAVE_MONETDB_JAVAJDBC?explain.SF-1739353
+HAVE_JDBCCLIENT_JAR?explain.SF-1739353
limit_timestampz.SF-1774217
convert_dec2varchar.SF-1774312
convert_dec2varchar_crash.SF-1775550
-HAVE_MONETDB_JAVAJDBC?jdbc_no_debug.SF-1739356
+HAVE_JDBCCLIENT_JAR?jdbc_no_debug.SF-1739356
cascade_operations_in_different_sessions.SF-1823387_create
cascade_operations_in_different_sessions.SF-1823387_drop
number_null_first_row.SF-1833286
U jdbc_no_debug.SF-1739356.SQL.sh
Index: jdbc_no_debug.SF-1739356.SQL.sh
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.SQL.sh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- jdbc_no_debug.SF-1739356.SQL.sh 29 Oct 2007 20:11:55 -0000 1.3
+++ jdbc_no_debug.SF-1739356.SQL.sh 1 Jul 2008 15:06:42 -0000 1.3.4.1
@@ -8,6 +8,6 @@
LANG="en_US.UTF-8"
export LANG
-Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
\"$RELSRCDIR/jdbc_no_debug.SF-1739356-data.sql\""
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -f \"$RELSRCDIR/jdbc_no_debug.SF-1739356-data.sql\""
rm -f .monetdb
U drop_schema_crash.SF-1504794.SQL.bat
Index: drop_schema_crash.SF-1504794.SQL.bat
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.bat,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- drop_schema_crash.SF-1504794.SQL.bat 29 Oct 2007 20:11:52 -0000
1.3
+++ drop_schema_crash.SF-1504794.SQL.bat 1 Jul 2008 15:06:40 -0000
1.3.4.1
@@ -8,6 +8,6 @@
prompt # $t $g
echo on
-call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\drop_schema_crash.SF-1504794-data.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-f "%RELSRCDIR%\drop_schema_crash.SF-1504794-data.sql"
@del .monetdb
U authorization.SF-1430616.SQL.sh
Index: authorization.SF-1430616.SQL.sh
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -d -r1.2.4.1 -r1.2.4.2
--- authorization.SF-1430616.SQL.sh 2 Jun 2008 15:16:59 -0000 1.2.4.1
+++ authorization.SF-1430616.SQL.sh 1 Jul 2008 15:06:40 -0000 1.2.4.2
@@ -8,20 +8,20 @@
LANG="en_US.UTF-8"
export LANG
-Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
\"$RELSRCDIR/authorization.SF-1430616-data.sql\""
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -f \"$RELSRCDIR/authorization.SF-1430616-data.sql\""
cat << EOF > .monetdb
user=voc
password=voc
EOF
-Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -q"
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -q"
cat << EOF > .monetdb
user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
\"$RELSRCDIR/authorization.SF-1430616-drop_user.sql\""
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -f \"$RELSRCDIR/authorization.SF-1430616-drop_user.sql\""
rm -f .monetdb
U explain.SF-1739353.SQL.bat
Index: explain.SF-1739353.SQL.bat
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/explain.SF-1739353.SQL.bat,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- explain.SF-1739353.SQL.bat 29 Oct 2007 20:11:54 -0000 1.3
+++ explain.SF-1739353.SQL.bat 1 Jul 2008 15:06:41 -0000 1.3.4.1
@@ -8,6 +8,6 @@
prompt # $t $g
echo on
-call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\explain.SF-1739353-data.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-f "%RELSRCDIR%\explain.SF-1739353-data.sql"
@del .monetdb
U explain.SF-1739353.SQL.sh
Index: explain.SF-1739353.SQL.sh
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/explain.SF-1739353.SQL.sh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- explain.SF-1739353.SQL.sh 29 Oct 2007 20:11:54 -0000 1.2
+++ explain.SF-1739353.SQL.sh 1 Jul 2008 15:06:42 -0000 1.2.4.1
@@ -8,6 +8,6 @@
LANG="en_US.UTF-8"
export LANG
-Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
\"$RELSRCDIR/explain.SF-1739353-data.sql\""
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -f \"$RELSRCDIR/explain.SF-1739353-data.sql\""
rm -f .monetdb
U jdbc_no_debug.SF-1739356.SQL.bat
Index: jdbc_no_debug.SF-1739356.SQL.bat
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.SQL.bat,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- jdbc_no_debug.SF-1739356.SQL.bat 29 Oct 2007 20:11:54 -0000 1.3
+++ jdbc_no_debug.SF-1739356.SQL.bat 1 Jul 2008 15:06:42 -0000 1.3.4.1
@@ -8,6 +8,6 @@
prompt # $t $g
echo on
-call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\jdbc_no_debug.SF-1739356-data.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-f "%RELSRCDIR%\jdbc_no_debug.SF-1739356-data.sql"
@del .monetdb
U authorization.SF-1430616.SQL.bat
Index: authorization.SF-1430616.SQL.bat
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/authorization.SF-1430616.SQL.bat,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -d -r1.3.4.1 -r1.3.4.2
--- authorization.SF-1430616.SQL.bat 2 Jun 2008 15:16:58 -0000 1.3.4.1
+++ authorization.SF-1430616.SQL.bat 1 Jul 2008 15:06:40 -0000 1.3.4.2
@@ -8,16 +8,16 @@
prompt # $t $g
echo on
-call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\authorization.SF-1430616-data.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-f "%RELSRCDIR%\authorization.SF-1430616-data.sql"
@echo user=voc> .monetdb
@echo password=voc>> .monetdb
-call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -q
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-q
echo user=monetdb> .monetdb
echo password=monetdb>> .monetdb
-call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\authorization.SF-1430616-drop_user.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-f "%RELSRCDIR%\authorization.SF-1430616-drop_user.sql"
@del .monetdb
U drop_schema_crash.SF-1504794.SQL.sh
Index: drop_schema_crash.SF-1504794.SQL.sh
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- drop_schema_crash.SF-1504794.SQL.sh 29 Oct 2007 20:11:53 -0000 1.2
+++ drop_schema_crash.SF-1504794.SQL.sh 1 Jul 2008 15:06:41 -0000 1.2.4.1
@@ -8,4 +8,4 @@
LANG="en_US.UTF-8"
export LANG
-Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
\"$RELSRCDIR/drop_schema_crash.SF-1504794-data.sql\""
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -f \"$RELSRCDIR/drop_schema_crash.SF-1504794-data.sql\""
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
