Merged revisions 7051,7056,7061 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r7051 | joost | 2007-04-01 17:18:21 +0200 (Sun, 01 Apr 2007) | 3 lines

 * Renamed too long testnames to shorter ones
 * Added TestSetBlobAsStringParam and TestSetBlobAsMemoParam tests
 * Fixed TestpfInUpdateFlag test
........
r7056 | michael | 2007-04-03 09:59:43 +0200 (Tue, 03 Apr 2007) | 1 line

* Added possibility to specify port
........
r7061 | florian | 2007-04-05 12:22:24 +0200 (Thu, 05 Apr 2007) | 2 lines

+ sparc lazarus project file

........

git-svn-id: branches/fixes_2_2@7215 -

.gitattributes

@@ -384,6 +384,7 @@ compiler/ppcgen/ngppccnv.pas svneol=native#text/plain
 compiler/ppcgen/ngppcinl.pas svneol=native#text/plain
 compiler/ppcgen/ngppcset.pas svneol=native#text/plain
 compiler/ppcppc.lpi svneol=native#text/plain
+compiler/ppcsparc.lpi svneol=native#text/plain
 compiler/ppheap.pas svneol=native#text/plain
 compiler/ppu.pas svneol=native#text/plain
 compiler/procinfo.pas svneol=native#text/plain

compiler/ppcsparc.lpi

@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <ProjectOptions>
+    <PathDelim Value="\"/>
+    <Version Value="5"/>
+    <General>
+      <Flags>
+        <MainUnitHasUsesSectionForAllUnits Value="False"/>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <MainUnit Value="0"/>
+      <IconPath Value="./"/>
+      <TargetFileExt Value=".exe"/>
+      <Title Value="pp"/>
+    </General>
+    <PublishOptions>
+      <Version Value="2"/>
+      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
+      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
+    </PublishOptions>
+    <RunParams>
+      <local>
+        <FormatVersion Value="1"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+      </local>
+    </RunParams>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="pp.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="pp"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="sparc\aasmcpu.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="aasmcpu"/>
+      </Unit1>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="5"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="sparc\pp"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="sparc\"/>
+      <OtherUnitFiles Value="sparc\;systems\"/>
+      <UnitOutputDirectory Value="sparc\lazbuild"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <D2Extensions Value="False"/>
+        <CStyleOperator Value="False"/>
+        <AllowLabel Value="False"/>
+        <CPPInline Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="True"/>
+      </Debugging>
+    </Linking>
+    <Other>
+      <Verbosity>
+        <ShowWarn Value="False"/>
+        <ShowNotes Value="False"/>
+        <ShowHints Value="False"/>
+      </Verbosity>
+      <ConfigFile>
+        <StopAfterErrCount Value="50"/>
+      </ConfigFile>
+      <CustomOptions Value="-dsparc
+"/>
+      <CompilerPath Value="$(CompPath)"/>
+    </Other>
+  </CompilerOptions>
+</CONFIG>

packages/fcl-db/src/sqldb/mysql/mysqlconn.inc

@@ -216,9 +216,13 @@ end;
 
 procedure TConnectionName.ConnectMySQL(var HMySQL : PMySQL;H,U,P : pchar);
 
+Var
+  Port : Cardinal;
+
 begin
   HMySQL := mysql_init(HMySQL);
-  HMySQL:=mysql_real_connect(HMySQL,PChar(H),PChar(U),Pchar(P),Nil,0,Nil,0);
+  Port:=Abs(StrToIntDef(Params.Values['Port'],0));
+  HMySQL:=mysql_real_connect(HMySQL,PChar(H),PChar(U),Pchar(P),Nil,Port,Nil,0);
   If (HMySQL=Nil) then
     MySQlError(Nil,SErrServerConnectFailed,Self);
 end;

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
+hostname=192.168.3.1
 
 [mysql41]
 connector=sql
@@ -54,15 +54,15 @@ connectorparams=oracle
 name=xe
 user=system
 password=apassword
-hostname=192.168.1.1
+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=apassword
+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