Patch from Luiz Americo:

 * Replace StrPas by String
 * Removes unnecessary code
 * Format surrounding code

git-svn-id: trunk@10342 -

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

@@ -288,24 +288,24 @@ function Num2SqlStr(APChar: PChar): String;
 begin
   if APChar = nil then
   begin
-    Result:=NullString;
+    Result := NullString;
     Exit;
   end;
-  Result:=StrPas(APChar);
+  Result := String(APChar);
 end;
 
 function Char2SqlStr(APChar: PChar): String;
 begin
   if APChar = nil then
   begin
-    Result:=NullString;
+    Result := NullString;
     Exit;
   end;
   //todo: create custom routine to directly transform PChar -> SQL str
-  Result:=StrPas(APChar);
-  if Pos('''',Result) > 0 then
-    Result:=AnsiReplaceStr(Result,'''','''''');
-  Result:=''''+Result+'''';
+  Result := String(APChar);
+  if Pos('''', Result) > 0 then
+    Result := AnsiReplaceStr(Result, '''', '''''');
+  Result := '''' + Result + '''';
 end;
 
 // TDSStream
@@ -313,14 +313,14 @@ end;
 constructor TDSStream.Create(const ActiveItem: PDataRecord; FieldIndex:Integer);
 begin
   inherited Create;
-  FPosition:=0;
-  FActiveItem:=ActiveItem;
-  FFieldIndex:=FieldIndex;
-  FFieldRow:=ActiveItem^.Row[FieldIndex];
+  //FPosition := 0;
+  FActiveItem := ActiveItem;
+  FFieldIndex := FieldIndex;
+  FFieldRow := ActiveItem^.Row[FieldIndex];
   if FFieldRow <> nil then
-    FRowSize:=StrLen(FFieldRow)
-  else
-    FRowSize:=0;  
+    FRowSize := StrLen(FFieldRow);
+  //else
+  //  FRowSize := 0;  
 end;  
 
 function TDSStream.Seek(Offset: Longint; Origin: Word): Longint;
@@ -585,36 +585,36 @@ end;
 function TCustomSqliteDataset.GetFieldData(Field: TField; Buffer: Pointer;
   NativeFormat: Boolean): Boolean;
 var
-  ValError:Word;
-  FieldRow:PChar;
+  ValError: Word;
+  FieldRow: PChar;
 begin
-  FieldRow:=PPDataRecord(ActiveBuffer)^^.Row[Field.FieldNo - 1];
+  FieldRow := PPDataRecord(ActiveBuffer)^^.Row[Field.FieldNo - 1];
   Result := FieldRow <> nil;  
   if Result and (Buffer <> nil) then //supports GetIsNull
   begin
     case Field.Datatype of
     ftString:
       begin
-        Move(FieldRow^,PChar(Buffer)^,StrLen(FieldRow)+1);
+        Move(FieldRow^, PChar(Buffer)^, StrLen(FieldRow) + 1);
       end;
-    ftInteger,ftAutoInc:
+    ftInteger, ftAutoInc:
       begin
-        Val(StrPas(FieldRow),LongInt(Buffer^),ValError);
-        Result:= ValError = 0;  
+        Val(String(FieldRow), LongInt(Buffer^), ValError);
+        Result := ValError = 0;  
       end;
-    ftBoolean,ftWord:
+    ftBoolean, ftWord:
       begin
-        Val(StrPas(FieldRow),Word(Buffer^),ValError);
-        Result:= ValError = 0;
+        Val(String(FieldRow), Word(Buffer^), ValError);
+        Result := ValError = 0;
       end;    
-    ftFloat,ftDateTime,ftTime,ftDate,ftCurrency:
+    ftFloat, ftDateTime, ftTime, ftDate, ftCurrency:
       begin
-        Val(StrPas(FieldRow),Double(Buffer^),ValError);
-        Result:= ValError = 0; 
+        Val(String(FieldRow), Double(Buffer^), ValError);
+        Result := ValError = 0; 
       end;
     ftLargeInt:
       begin
-        Val(StrPas(FieldRow),Int64(Buffer^),ValError);
+        Val(String(FieldRow), Int64(Buffer^), ValError);
         Result:= ValError = 0;
       end;        
     end;
@@ -757,24 +757,24 @@ end;
 
 procedure TCustomSqliteDataset.InternalDelete;
 var
-  TempItem:PDataRecord;
-  ValError,TempInteger:Integer;
+  TempItem: PDataRecord;
+  ValError, TempInteger: Integer;
 begin
   Dec(FRecordCount);
-  TempItem:=PPDataRecord(ActiveBuffer)^;
-  TempItem^.Next^.Previous:=TempItem^.Previous;
-  TempItem^.Previous^.Next:=TempItem^.Next;
+  TempItem := PPDataRecord(ActiveBuffer)^;
+  TempItem^.Next^.Previous := TempItem^.Previous;
+  TempItem^.Previous^.Next := TempItem^.Next;
   if FCurrentItem = TempItem then
   begin
     if FCurrentItem^.Previous <> FBeginItem then
-      FCurrentItem:= FCurrentItem^.Previous
+      FCurrentItem := FCurrentItem^.Previous
     else
-      FCurrentItem:= FCurrentItem^.Next;  
+      FCurrentItem := FCurrentItem^.Next;  
   end; 
   // Dec FNextAutoInc (only if deleted item is the last record)  
   if FAutoIncFieldNo <> -1 then
   begin
-    Val(StrPas(TempItem^.Row[FAutoIncFieldNo]),TempInteger,ValError);
+    Val(String(TempItem^.Row[FAutoIncFieldNo]), TempInteger, ValError);
     if (ValError = 0) and (TempInteger = (FNextAutoInc - 1)) then
       Dec(FNextAutoInc);
   end;    
@@ -1351,7 +1351,7 @@ begin
     begin
       TempItem:=PDataRecord(FDeletedItems.List^[iItems]);
       SqlTemp:=SqlTemp+(TemplateStr+
-        StrPas(TempItem^.Row[FPrimaryKeyNo])+';');
+        String(TempItem^.Row[FPrimaryKeyNo])+';');
       FreeItem(TempItem);
       inc(StatementsCounter);
       //ApplyUpdates each 400 statements
@@ -1379,7 +1379,7 @@ begin
       iFields:=Fields.Count - 1;
       ASqlLine:=ASqlLine + (Fields[iFields].FieldName +' = '+
         FGetSqlStr[iFields](PDataRecord(FUpdatedItems[iItems])^.Row[iFields])+
-        WhereKeyNameEqual+StrPas(PDataRecord(FUpdatedItems[iItems])^.Row[FPrimaryKeyNo])+';');
+        WhereKeyNameEqual+String(PDataRecord(FUpdatedItems[iItems])^.Row[FPrimaryKeyNo])+';');
       SqlTemp:=SqlTemp + ASqlLine;
       inc(StatementsCounter);
       //ApplyUpdates each 400 statements

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

@@ -105,15 +105,15 @@ function GetAutoIncValue(NextValue: Pointer; Columns: Integer; ColumnValues: PPC
 var
   CodeError, TempInt: Integer;
 begin
-  TempInt:=-1;
+  TempInt := -1;
   if ColumnValues[0] <> nil then
   begin
-    Val(StrPas(ColumnValues[0]),TempInt,CodeError);
+    Val(String(ColumnValues[0]), TempInt, CodeError);
     if CodeError <> 0 then
-      DatabaseError('SqliteDs - Error trying to get last autoinc value');
+      DatabaseError('TSqlite3Dataset: Error trying to get last autoinc value');
   end;
-  Integer(NextValue^):=Succ(TempInt);
-  Result:=1;
+  Integer(NextValue^) := Succ(TempInt);
+  Result := 1;
 end;
 
 { TSqlite3Dataset }
@@ -174,10 +174,10 @@ begin
   SetLength(FGetSqlStr,ColumnCount);
   for i := 0 to ColumnCount - 1 do
   begin
-   ColumnStr := UpperCase(StrPas(sqlite3_column_decltype(vm,i)));
+   ColumnStr := UpperCase(String(sqlite3_column_decltype(vm,i)));
    if (ColumnStr = 'INTEGER') or (ColumnStr = 'INT') then
    begin
-     if AutoIncrementKey and (UpperCase(StrPas(sqlite3_column_name(vm,i))) = UpperCase(PrimaryKey)) then
+     if AutoIncrementKey and (UpperCase(String(sqlite3_column_name(vm,i))) = UpperCase(PrimaryKey)) then
      begin
        AType := ftAutoInc;
        FAutoIncFieldNo := i;
@@ -224,9 +224,9 @@ begin
      AType := ftString;
    end;
    if AType = ftString then
-     FieldDefs.Add(StrPas(sqlite3_column_name(vm,i)), AType, dsMaxStringSize)
+     FieldDefs.Add(String(sqlite3_column_name(vm,i)), AType, dsMaxStringSize)
    else
-     FieldDefs.Add(StrPas(sqlite3_column_name(vm,i)), AType);  
+     FieldDefs.Add(String(sqlite3_column_name(vm,i)), AType);  
    //Set the pchar2sql function
    if AType in [ftString,ftMemo] then
      FGetSqlStr[i]:=@Char2SqlStr
@@ -315,7 +315,7 @@ end;
 
 function TSqlite3Dataset.GetSqliteVersion: String;
 begin
-  Result:=StrPas(sqlite3_version());
+  Result := String(sqlite3_version());
 end;
 
 function TSqlite3Dataset.QuickQuery(const ASql:String;const AStrList: TStrings;FillObjects:Boolean):String;
@@ -326,30 +326,30 @@ var
   begin
     while FReturnCode = SQLITE_ROW do
     begin
-      AStrList.Add(StrPas(sqlite3_column_text(vm,0)));
-      FReturnCode:=sqlite3_step(vm);
+      AStrList.Add(String(sqlite3_column_text(vm,0)));
+      FReturnCode := sqlite3_step(vm);
     end;
   end;
   procedure FillStringsAndObjects;
   begin
     while FReturnCode = SQLITE_ROW do
     begin
-      AStrList.AddObject(StrPas(sqlite3_column_text(vm,0)),TObject(PtrInt(sqlite3_column_int(vm,1))));
-      FReturnCode:=sqlite3_step(vm);
+      AStrList.AddObject(String(sqlite3_column_text(vm,0)), TObject(PtrInt(sqlite3_column_int(vm,1))));
+      FReturnCode := sqlite3_step(vm);
     end;
   end;    
 begin
   if FSqliteHandle = nil then
     GetSqliteHandle;
-  Result:='';
-  FReturnCode:=sqlite3_prepare(FSqliteHandle,Pchar(ASql),-1,@vm,nil);
+  Result := '';
+  FReturnCode := sqlite3_prepare(FSqliteHandle,Pchar(ASql), -1, @vm, nil);
   if FReturnCode <> SQLITE_OK then
     DatabaseError(ReturnString,Self);
     
-  FReturnCode:=sqlite3_step(vm);
+  FReturnCode := sqlite3_step(vm);
   if (FReturnCode = SQLITE_ROW) and (sqlite3_column_count(vm) > 0) then
   begin
-    Result:=StrPas(sqlite3_column_text(vm,0));
+    Result := String(sqlite3_column_text(vm,0));
     if AStrList <> nil then
     begin   
       if FillObjects and (sqlite3_column_count(vm) > 1) then

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

@@ -72,15 +72,15 @@ function GetAutoIncValue(NextValue: Pointer; Columns: Integer; ColumnValues: PPC
 var
   CodeError, TempInt: Integer;
 begin
-  TempInt:=-1;
+  TempInt := -1;
   if ColumnValues[0] <> nil then
   begin
-    Val(StrPas(ColumnValues[0]),TempInt,CodeError);
+    Val(String(ColumnValues[0]), TempInt, CodeError);
     if CodeError <> 0 then
-      DatabaseError('SqliteDs - Error trying to get last autoinc value');
+      DatabaseError('TSqliteDataset: Error trying to get last autoinc value');
   end;
-  Integer(NextValue^):=Succ(TempInt);
-  Result:=1;
+  Integer(NextValue^) := Succ(TempInt);
+  Result := 1;
 end;
 
 { TSqliteDataset }
@@ -103,7 +103,7 @@ begin
   Result := sqlite_open(PChar(FFileName), 0, @ErrorStr);
   if Result = nil then
   begin
-    DatabaseError('Error opening "' + FFileName +'": ' + StrPas(ErrorStr));
+    DatabaseError('Error opening "' + FFileName +'": ' + String(ErrorStr));
     sqlite_freemem(ErrorStr);
   end;
 end;
@@ -133,11 +133,11 @@ begin
   // If the field contains another type, may have problems
   for i := 0 to ColumnCount - 1 do
   begin
-    ColumnStr := UpperCase(StrPas(ColumnNames[i + ColumnCount]));
+    ColumnStr := UpperCase(String(ColumnNames[i + ColumnCount]));
     if (ColumnStr = 'INTEGER') or (ColumnStr = 'INT') then
     begin
       if AutoIncrementKey and
-           (UpperCase(StrPas(ColumnNames[i])) = UpperCase(PrimaryKey)) then
+           (UpperCase(String(ColumnNames[i])) = UpperCase(PrimaryKey)) then
       begin
         AType := ftAutoInc;
         FAutoIncFieldNo := i;
@@ -184,9 +184,9 @@ begin
       AType := ftString;
     end;    
     if AType = ftString then
-      FieldDefs.Add(StrPas(ColumnNames[i]), AType, dsMaxStringSize)
+      FieldDefs.Add(String(ColumnNames[i]), AType, dsMaxStringSize)
     else
-      FieldDefs.Add(StrPas(ColumnNames[i]), AType);  
+      FieldDefs.Add(String(ColumnNames[i]), AType);  
     //Set the pchar2sql function
     if AType in [ftString,ftMemo] then
       FGetSqlStr[i]:=@Char2SqlStr
@@ -308,26 +308,26 @@ end;
 
 function TSqliteDataset.GetSqliteEncoding: String;
 begin
-  Result:=StrPas(sqlite_encoding);
+  Result := String(sqlite_encoding);
 end;
   
 function TSqliteDataset.GetSqliteVersion: String;
 begin
-  Result:=StrPas(sqlite_version);
+  Result := String(sqlite_version);
 end;
 
 function TSqliteDataset.QuickQuery(const ASql:String;const AStrList: TStrings;FillObjects:Boolean):String;
 var
-  vm:Pointer;
-  ColumnNames,ColumnValues:PPChar;
-  ColCount:Integer;
+  vm: Pointer;
+  ColumnNames, ColumnValues: PPChar;
+  ColCount: Integer;
   
   procedure FillStrings;
   begin
     while FReturnCode = SQLITE_ROW do
     begin
-      AStrList.Add(StrPas(ColumnValues[0]));
-      FReturnCode:=sqlite_step(vm,@ColCount,@ColumnValues,@ColumnNames);
+      AStrList.Add(String(ColumnValues[0]));
+      FReturnCode := sqlite_step(vm, @ColCount, @ColumnValues, @ColumnNames);
     end;
   end;
   procedure FillStringsAndObjects;
@@ -335,22 +335,22 @@ var
     while FReturnCode = SQLITE_ROW do
     begin
       // I know, this code is really dirty!!
-      AStrList.AddObject(StrPas(ColumnValues[0]),TObject(PtrInt(StrToInt(StrPas(ColumnValues[1])))));
-      FReturnCode:=sqlite_step(vm,@ColCount,@ColumnValues,@ColumnNames);
+      AStrList.AddObject(String(ColumnValues[0]), TObject(PtrInt(StrToInt(String(ColumnValues[1])))));
+      FReturnCode:=sqlite_step(vm, @ColCount, @ColumnValues, @ColumnNames);
     end;
   end;    
 begin
   if FSqliteHandle = nil then
     GetSqliteHandle;
-  Result:='';
-  FReturnCode:=sqlite_compile(FSqliteHandle,Pchar(ASql),nil,@vm,nil);
+  Result := '';
+  FReturnCode := sqlite_compile(FSqliteHandle, PChar(ASql), nil, @vm, nil);
   if FReturnCode <> SQLITE_OK then
     DatabaseError(ReturnString,Self);
     
-  FReturnCode:=sqlite_step(vm,@ColCount,@ColumnValues,@ColumnNames);
+  FReturnCode := sqlite_step(vm, @ColCount, @ColumnValues, @ColumnNames);
   if (FReturnCode = SQLITE_ROW) and (ColCount > 0) then
   begin
-    Result:=StrPas(ColumnValues[0]);
+    Result := String(ColumnValues[0]);
     if AStrList <> nil then
     begin   
       if FillObjects and (ColCount > 1) then