* Renamed too long testnames to shorter ones

 * Added TestSetBlobAsStringParam and TestSetBlobAsMemoParam tests
 * Fixed TestpfInUpdateFlag test

git-svn-id: trunk@7051 -

packages/fcl-db/tests/database.ini

@@ -1,7 +1,7 @@
 [Database]
 ; This file contains several sections, one for each database-type. Select here
 ; which database has to be tested currently.
-type=dbf
+type=interbase
 
 
 
@@ -22,15 +22,15 @@ user=
 ; password to log in with
 password=
 ; hostname of the database-server
-hostname=
+hostname=192.168.3.25
 
 [mysql40]
 connector=sql
 connectorparams=mysql40
-name=testdb
+name=cnoc02
 user=root
-password=apassword
-hostname=192.168.1.1
+password=rosivrepus
+hostname=192.168.3.1
 
 [mysql41]
 connector=sql
@@ -53,16 +53,16 @@ connector=sql
 connectorparams=oracle
 name=xe
 user=system
-password=apassword
-hostname=192.168.1.1
+password=rosivrepus
+hostname=192.168.3.1
 
 [interbase]
 connector=sql
 connectorparams=interbase
-name=/path/to/database.fdb
+name=/opt/firebird/data/testdb.fdb
 user=sysdba
-password=masterkey
-hostname=192.168.1.1
+password=rosivrepus
+hostname=localhost
 
 [odbc]
 connector=sql

packages/fcl-db/tests/testdbbasics.pas

@@ -41,9 +41,9 @@ type
     procedure TestAppendOnEmptyDataset;
     procedure TestInsertOnEmptyDataset;
 
-    procedure TestBufDatasetCancelUpdates; //bug 6938
+    procedure TestBufDatasetCancelUpd; //bug 6938
     procedure TestEofAfterFirst;           //bug 7211
-    procedure TestBufDatasetCancelUpdates1;
+    procedure TestBufDatasetCancelUpd1;
     procedure TestDoubleClose;
     procedure TestCalculatedField;
     procedure TestAssignFieldftString;
@@ -787,7 +787,7 @@ begin
   AParam.Free;
 end;
 
-procedure TTestDBBasics.TestBufDatasetCancelUpdates;
+procedure TTestDBBasics.TestBufDatasetCancelUpd;
 var i : byte;
 begin
   if not (DBConnector.GetNDataset(5) is TBufDataset) then
@@ -902,7 +902,7 @@ begin
   end;
 end;
 
-procedure TTestDBBasics.TestBufDatasetCancelUpdates1;
+procedure TTestDBBasics.TestBufDatasetCancelUpd1;
 var i : byte;
 begin
   if not (DBConnector.GetNDataset(5) is TBufDataset) then

packages/fcl-db/tests/testsqlfieldtypes.pas

@@ -26,10 +26,11 @@ type
     procedure TearDown; override;
     procedure RunTest; override;
   published
-  
     procedure TestUpdateIndexDefs;
+    procedure TestSetBlobAsMemoParam;
+    procedure TestSetBlobAsStringParam;
     procedure TestGetIndexDefs;
-    procedure TestDoubleQuoteEscapeComments;
+    procedure TestDblQuoteEscComments;
     procedure TestpfInUpdateFlag; // bug 7565
     procedure TestInt;
     procedure TestScript;
@@ -37,7 +38,7 @@ type
     procedure TestTemporaryTable;
 
     procedure TestParametersAndDates;
-    procedure TestExceptionOnsecondClose;
+    procedure TestExceptOnsecClose;
 
     procedure TestBlob;
     procedure TestChangeBlob;
@@ -131,7 +132,7 @@ begin
     AFld1 := TIntegerField.Create(ds);
     AFld1.FieldName := 'ID';
     AFld1.DataSet := ds;
-    AFld1.ProviderFlags := [pfInKey];
+    AFld1.ProviderFlags := AFld1.ProviderFlags + [pfInKey];
 
     AFld2 := TStringField.Create(ds);
     AFld2.FieldName := 'NAME';
@@ -459,6 +460,34 @@ begin
     end;
 end;
 
+procedure TTestFieldTypes.TestSetBlobAsStringParam;
+
+var
+  i             : byte;
+  ASQL          : TSQLQuery;
+
+begin
+  CreateTableWithFieldType(ftBlob,'BLOB');
+//  CreateTableWithFieldType(ftBlob,'TEXT');
+  TestFieldDeclaration(ftBlob,0);
+
+  ASQL := DBConnector.GetNDataset(True,1) as tsqlquery;
+  with ASql  do
+    begin
+    sql.Text := 'insert into FPDEV2 (FT) values (:BlobParam)';
+    Params.ParamByName('blobParam').AsString := 'Test deze BLob';
+    ExecSQL;
+    end;
+
+  with TSQLDBConnector(DBConnector).Query do
+    begin
+    Open;
+    if not eof then
+      AssertEquals('Test deze BLob',fields[0].AsString);
+    close;
+    end;
+end;
+
 
 procedure TTestFieldTypes.TestBlob;
 
@@ -850,6 +879,34 @@ begin
   Asserttrue(ds.indexdefs[0].Options=[ixPrimary,ixUnique]);
 end;
 
+procedure TTestFieldTypes.TestSetBlobAsMemoParam;
+var
+  i             : byte;
+  ASQL          : TSQLQuery;
+
+begin
+  CreateTableWithFieldType(ftBlob,'BLOB');
+//  CreateTableWithFieldType(ftBlob,'TEXT');
+  TestFieldDeclaration(ftBlob,0);
+
+  ASQL := DBConnector.GetNDataset(True,1) as tsqlquery;
+  with ASql  do
+    begin
+    sql.Text := 'insert into FPDEV2 (FT) values (:BlobParam)';
+    Params.ParamByName('blobParam').AsMemo := 'Test deze BLob';
+    ExecSQL;
+    end;
+
+  with TSQLDBConnector(DBConnector).Query do
+    begin
+    Open;
+    if not eof then
+      AssertEquals('Test deze BLob',fields[0].AsString);
+    close;
+    end;
+
+end;
+
 procedure TTestFieldTypes.TestTemporaryTable;
 begin
   with TSQLDBConnector(DBConnector).Query do
@@ -892,7 +949,7 @@ begin
   inddefs.Free;
 end;
 
-procedure TTestFieldTypes.TestDoubleQuoteEscapeComments;
+procedure TTestFieldTypes.TestDblQuoteEscComments;
 begin
   with TSQLDBConnector(DBConnector).Query do
     begin
@@ -925,7 +982,7 @@ begin
     end
 end;
 
-procedure TTestFieldTypes.TestExceptionOnsecondClose;
+procedure TTestFieldTypes.TestExceptOnsecClose;
 begin
   with TSQLDBConnector(DBConnector).Query do
     begin