Update of /cvsroot/monetdb/sql/src/test/mapi/Tests
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22301/sql/src/test/mapi/Tests
Modified Files:
python_dbapi_embedded.bat python_dbapi_embedded.sh
Log Message:
With MonetDB4 support for SQL & GEOM being history,
there is no need to have MonetDB5 as conditional back-end;
MonetDB5 now is the mandatory, default, "hard-wired" back-end.
For convenience, the changes are wrapped in CVS tags
"explicit_MonetDB5" & "implicit_MonetDB5".
U python_dbapi_embedded.bat
Index: python_dbapi_embedded.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.bat,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- python_dbapi_embedded.bat 26 Nov 2007 12:03:38 -0000 1.10
+++ python_dbapi_embedded.bat 29 Oct 2008 23:05:52 -0000 1.11
@@ -6,12 +6,9 @@
set
PYTHONPATH=%CLIENTS_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%\MonetDB;%PYTHONPATH%
set
PYTHONPATH=%SQL_PREFIX%\%PYTHON_LIBDIR%;%SQL_PREFIX%\%PYTHON_LIBDIR%\MonetDB;%PYTHONPATH%
-set v=4
-if "%TST_FIVE%" == "Five" set v=5
-
-set PYTHONPATH=%TSTBLDBASE%\NT\src\backends\python\monet%V%;%PYTHONPATH%
+set PYTHONPATH=%TSTBLDBASE%\NT\src\backends\python\monet5;%PYTHONPATH%
prompt # $t $g
echo on
-sqlsample.py "%GDK_DBFARM%" "%TSTDB%" %v%
+sqlsample.py "%GDK_DBFARM%" "%TSTDB%" 5
U python_dbapi_embedded.sh
Index: python_dbapi_embedded.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- python_dbapi_embedded.sh 10 Aug 2008 09:01:09 -0000 1.11
+++ python_dbapi_embedded.sh 29 Oct 2008 23:05:52 -0000 1.12
@@ -8,21 +8,15 @@
PYTHONPATH="`monetdb-sql-config --pythonlibdir`:`monetdb-sql-config
--pythonlibdir`/MonetDB:$PYTHONPATH"
export PYTHONPATH
-if [ -n "$TST_FIVE" ] ; then
- v=5
- c=`monetdb$v-config --sysconfdir`/monetdb5.conf
-else
- v=4
- c=`monetdb$v-config --sysconfdir`/MonetDB.conf
-fi
-PYTHONPATH="$TSTBLDBASE/src/backends/python/monet$v/:$PYTHONPATH"
-PYTHONPATH="$TSTBLDBASE/src/backends/python/monet$v/.libs:$PYTHONPATH"
+c=`monetdb5-config --sysconfdir`/monetdb5.conf
+PYTHONPATH="$TSTBLDBASE/src/backends/python/monet5/:$PYTHONPATH"
+PYTHONPATH="$TSTBLDBASE/src/backends/python/monet5/.libs:$PYTHONPATH"
export PYTHONPATH
# make sure we find module sql[_server]
mv $c $c.BAK
sed -e "s|^monet_mod_path=.*$|monet_mod_path=$MONETDB_MOD_PATH|" $c.BAK > $c
-Mlog -x "sqlsample.py $GDK_DBFARM $TSTDB $v"
+Mlog -x "sqlsample.py $GDK_DBFARM $TSTDB 5"
# clean-up
mv -f $c.BAK $c
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
