Browse Source

* Removed the dependency on the ini-file, specified DBConnectorName manually

git-svn-id: trunk@12224 -
joost 16 years ago
parent
commit
856ee3f7c1

+ 0 - 1
.gitattributes

@@ -7587,7 +7587,6 @@ tests/test/opt/treg4.pp svneol=native#text/plain
 tests/test/opt/tretopt.pp svneol=native#text/plain
 tests/test/opt/tspace.pp svneol=native#text/plain
 tests/test/packages/fcl-db/assertions.pas svneol=native#text/plain
-tests/test/packages/fcl-db/database.ini svneol=native#text/plain
 tests/test/packages/fcl-db/dbftoolsunit.pas svneol=native#text/plain
 tests/test/packages/fcl-db/tdb1.pp svneol=native#text/plain
 tests/test/packages/fcl-db/tdb2.pp svneol=native#text/plain

+ 0 - 90
tests/test/packages/fcl-db/database.ini

@@ -1,90 +0,0 @@
-; This file contains several sections, one for each database-type. Select here
-; which section has to be used currently.
-[Database]
-type=dbf
-
-; These sections are for the several SQLDB-types of databases:
-[postgresql]
-
-; The connector specifies the DB-component that has to be used. The 'sql'
-; connector tests the SQLDB components
-connector=sql
-
-; Here you can give some parameters, which are specific for each connector. The
-; SQL connector uses this parameter to specify the connection that should be
-; used;
-connectorparams=postgresql
-
-; The name of the database. The database could be empty. You only need read and
-; write rights.
-name=testdb
-
-; user to log in with
-user=
-
-; password to log in with
-password=
-
-; hostname of the database-server
-hostname=127.0.0.1
-
-[mysql40]
-connector=sql
-connectorparams=mysql40
-name=testdb
-user=root
-password=
-hostname=127.0.0.1
-
-[mysql41]
-connector=sql
-connectorparams=mysql41
-name=testdb
-user=root
-password=
-hostname=127.0.0.1
-
-[mysql50]
-connector=sql
-connectorparams=mysql50
-name=testdb
-user=root
-password=
-hostname=127.0.0.1
-
-[oracle]
-connector=sql
-connectorparams=oracle
-name=xe
-user=system
-password=
-hostname=127.0.0.1
-
-[interbase]
-connector=sql
-connectorparams=interbase
-name=/opt/firebird/data/testdb.fdb
-user=sysdba
-password=
-hostname=localhost
-
-[odbc]
-connector=sql
-connectorparams=odbc
-name=testdb
-user=root
-password=
-hostname=127.0.0.1
-
-
-; This section is for a connector for TDbf:
-[dbf]
-connector=dbf
-
-; Give here the path where the *.dbf file can be generated
-name=.
-
-; This section is for a connector for MemDS:
-[memds]
-connector=memds
-

+ 1 - 0
tests/test/packages/fcl-db/tdb1.pp

@@ -13,6 +13,7 @@ var AVar          : Variant;
     PassException : boolean;
 
 begin
+  DBConnectorName := 'dbf';
   InitialiseDBConnector;
   with DBConnector.GetNDataset(true,14) do
     begin

+ 1 - 0
tests/test/packages/fcl-db/tdb2.pp

@@ -13,6 +13,7 @@ uses
 var PassException : boolean;
 
 begin
+  DBConnectorName := 'dbf';
   InitialiseDBConnector;
   with DBConnector.GetNDataset(true,11) do
     begin