Adapt demos programs to use sqlite3ds by default

git-svn-id: trunk@31841 -

packages/fcl-db/src/sqlite/browseds.pas

@@ -4,9 +4,6 @@ program browseds;
 {$H+}
 {$define DEBUGHEAP}
 
-//To test the sqlite3 version replace sqliteds by sqlite3ds
-//  and TSqliteDataset by TSqlite3Dataset
-
 uses 
 {$ifdef DEBUGHEAP}
   Heaptrc,
@@ -15,17 +12,16 @@ uses
   cmem,
 {$endif}
   crt,
-  sqliteds,
-  sysutils,db,inifiles;
+  sqlite3ds,
+  sysutils, db, inifiles;
 
 const
   SQLITEDS_TESTS_INI_FILE = 'sqlitedstests.ini';
   DEFAULT_TABLENAME = 'tabletest';
   DEFAULT_FILENAME = 'test.db';
 
-
 var 
-  dsTest:TSqliteDataset;
+  dsTest: TSqlite3Dataset;
   ini: TIniFile;
   i:Integer;
 
@@ -57,7 +53,7 @@ begin
   {$ifdef DEBUGHEAP}
   SetHeapTraceOutput(ExtractFileName(ParamStr(0))+'.heap.log');
   {$endif}
-  dsTest:=TSqliteDataset.Create(nil);
+  dsTest:=TSqlite3Dataset.Create(nil);
   with dsTest do
   begin
     //Load Database properties from a inifile

packages/fcl-db/src/sqlite/concurrencyds.pas

@@ -4,9 +4,6 @@ program concurrencyds;
 {$H+}
 {$define DEBUGHEAP}
 
-//To test the sqlite3 version replace sqliteds by sqlite3ds
-//  and TSqliteDataset by TSqlite3Dataset
-
 uses
 {$ifdef DEBUGHEAP}
   Heaptrc,
@@ -14,7 +11,7 @@ uses
 {$ifdef Linux}
   cmem,
 {$endif}
-  sysutils,sqliteds, inifiles;
+  sysutils,sqlite3ds, inifiles;
   
 const
   SQLITEDS_TESTS_INI_FILE = 'sqlitedstests.ini';
@@ -37,7 +34,7 @@ const
   );
 
 var
-  dsArray: array [0..10] of TSqliteDataset;
+  dsArray: array [0..10] of TSqlite3Dataset;
   ini:TIniFile;
   i: Integer;
 
@@ -48,7 +45,7 @@ begin
   ini:=TIniFile.Create(SQLITEDS_TESTS_INI_FILE);
   for i:= 0 to 10 do
   begin
-    dsArray[i] := TSqliteDataset.Create(nil);
+    dsArray[i] := TSqlite3Dataset.Create(nil);
     with dsArray[i] do
     begin
       FileName:=ini.ReadString('testinfo','filename',DEFAULT_FILENAME);

packages/fcl-db/src/sqlite/createds.pas

@@ -4,9 +4,6 @@ program createds;
 {$H+}
 {$define DEBUGHEAP}
 
-//To test the sqlite3 version replace sqliteds by sqlite3ds
-//  and TSqliteDataset by TSqlite3Dataset
-
 uses 
 {$ifdef DEBUGHEAP}
   Heaptrc,
@@ -14,7 +11,7 @@ uses
 {$ifdef Linux}
   cmem,
 {$endif}
-  sqliteds,
+  sqlite3ds,
   sysutils,db,inifiles;
 
 const
@@ -23,14 +20,14 @@ const
   DEFAULT_FILENAME = 'test.db';
   
 var 
-  dsTest:TSqliteDataset;
+  dsTest: TSqlite3Dataset;
   ini: TIniFile;
 
 begin 
   {$ifdef DEBUGHEAP}
   SetHeapTraceOutput(ExtractFileName(ParamStr(0))+'.heap.log');
   {$endif}
-  dsTest:=TSqliteDataset.Create(nil);
+  dsTest:=TSqlite3Dataset.Create(nil);
   with dsTest do
   begin
     //Load Database properties from a inifile
@@ -58,8 +55,15 @@ begin
       Add('LargeInt',ftLargeint);
       Add('Currency',ftCurrency);
     end; 
-    CreateTable;
-    writeln('ReturnString after CreateTable: ',ReturnString);
+    if CreateTable then
+	begin
+	  WriteLn('Table created successfully');
+	  if not TableExists then
+	    WriteLn('TableExists check failed with error: ', ReturnString);
+	end  
+	else
+      WriteLn('Error creating table');
+    WriteLn('ReturnString after CreateTable: ',ReturnString);
     Destroy;
   end;
 end.

packages/fcl-db/src/sqlite/fillds.pas

@@ -4,9 +4,6 @@ program fillds;
 {$H+}
 {$define DEBUGHEAP}
 
-//To test the sqlite3 version replace sqliteds by sqlite3ds
-//  and TSqliteDataset by TSqlite3Dataset
-
 uses 
 {$ifdef DEBUGHEAP}
   Heaptrc,
@@ -14,7 +11,7 @@ uses
 {$ifdef Linux}
   cmem,
 {$endif}
-  sqliteds,
+  sqlite3ds,
   sysutils,db,IniFiles;
 
 const
@@ -24,14 +21,14 @@ const
   MEMOTEST_FILENAME = 'createds.pas';
 
 var 
-  dsTest:TSqliteDataset;
+  dsTest: TSqlite3Dataset;
   ini: TIniFile;
 
 begin 
   {$ifdef DEBUGHEAP}
   SetHeapTraceOutput(ExtractFileName(ParamStr(0))+'.heap.log');
   {$endif}
-  dsTest:=TSqliteDataset.Create(nil);
+  dsTest:=TSqlite3Dataset.Create(nil);
   with dsTest do
   begin
      //Load Database properties from a inifile
@@ -55,6 +52,7 @@ begin
     FieldByName('Currency').AsFloat:=1.23;
     FieldByName('LargeInt').AsLargeInt:=2163871263187263;
     Post;
+	{
     Append;
     FieldByName('Integer').AsInteger:=101;
     FieldByName('String').AsString:='Américo';
@@ -93,6 +91,7 @@ begin
     writeln('ReturnString after ApplyUpdates: ',ReturnString);
     //Is not necessary to call Close. Destroy will call it.
     //Close;
+	}
     Destroy;
   end;
 end.

packages/fcl-db/src/sqlite/testds.pas

@@ -4,9 +4,6 @@ program testds;
 {$H+}
 {$define DEBUGHEAP}
 
-//To test the sqlite3 version replace sqliteds by sqlite3ds
-//  and TSqliteDataset by TSqlite3Dataset
-
 uses
 {$ifdef DEBUGHEAP}
   Heaptrc,
@@ -14,7 +11,7 @@ uses
 {$ifdef Linux}
   cmem,
 {$endif}
-  crt,sysutils,db,sqliteds,IniFiles;
+  crt,sysutils,db,sqlite3ds,IniFiles;
 
 const
   SQLITEDS_TESTS_INI_FILE = 'sqlitedstests.ini';
@@ -22,14 +19,14 @@ const
   DEFAULT_FILENAME = 'test.db';
 
 var
-  dsTest:TSqliteDataset;
+  dsTest: TSqlite3Dataset;
   ini: TIniFile;
 
 begin
   {$ifdef DEBUGHEAP}
   SetHeapTraceOutput(ExtractFileName(ParamStr(0))+'.heap.log');
   {$endif}
-  dsTest:=TSqliteDataset.Create(nil);
+  dsTest:=TSqlite3Dataset.Create(nil);
   with dsTest do
   begin
     //Load Database properties from a inifile