Patch from Luiz Americo:

- Correctly recognizes fields resulted from an expression or subquery
- Remove unnecessary fields (FExpected*)
- Group boolean fields together
- Format surrounding code

git-svn-id: trunk@10676 -

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

@@ -91,13 +91,7 @@ type
     {$endif}
     FInternalActiveBuffer: PDataRecord;
     FInsertBookmark: PDataRecord;
-    FExpectedAppends: Integer;
-    FExpectedDeletes: Integer;
-    FExpectedUpdates: Integer;
     FOnCallback: TSqliteCallback;
-    FSaveOnClose: Boolean;
-    FSaveOnRefetch: Boolean;
-    FAutoIncrementKey: Boolean;
     FMasterLink: TMasterDataLink;
     FIndexFieldNames: String;
     FIndexFieldList: TList;
@@ -121,7 +115,6 @@ type
     FDeletedItems: TFPList;
     FReturnCode: Integer;
     FSqliteHandle: Pointer;
-    FDataAllocated: Boolean;
     FRowBufferSize: Integer;
     FRowCount: Integer;
     FRecordCount: Integer;
@@ -129,6 +122,10 @@ type
     FEndItem: PDataRecord;
     FCacheItem: PDataRecord;
     FGetSqlStr: array of TGetSqlStrFunction;
+    FSaveOnClose: Boolean;
+    FSaveOnRefetch: Boolean;
+    FAutoIncrementKey: Boolean;
+    FDataAllocated: Boolean;
     function SqliteExec(Sql:PChar; ACallback: TSqliteCdeclCallback; Data: Pointer):Integer;virtual; abstract;
     procedure InternalCloseHandle;virtual;abstract;
     function InternalGetHandle: Pointer; virtual; abstract;
@@ -212,9 +209,9 @@ type
     procedure SetCurrentItem(Value:PDataRecord);
     property FCurrentItem: PDataRecord read FFCurrentItem write SetCurrentItem;
     {$endif}
-    property ExpectedAppends: Integer read FExpectedAppends write SetExpectedAppends;
-    property ExpectedUpdates: Integer read FExpectedUpdates write SetExpectedUpdates;
-    property ExpectedDeletes: Integer read FExpectedDeletes write SetExpectedDeletes;
+    property ExpectedAppends: Integer write SetExpectedAppends;
+    property ExpectedUpdates: Integer write SetExpectedUpdates;
+    property ExpectedDeletes: Integer write SetExpectedDeletes;
     property IndexFields[Value: Integer]: TField read GetIndexFields;
     property RowsAffected: Integer read GetRowsAffected;
     property ReturnCode: Integer read FReturnCode;

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

@@ -152,50 +152,52 @@ begin
 end;
 
 procedure TSqlite3Dataset.InternalInitFieldDefs;
+const
+  FieldSizeMap: array[Boolean] of Integer = (0, dsMaxStringSize);
 var
-  vm:Pointer;
-  ColumnStr:String;
-  i,ColumnCount:Integer;
-  AType:TFieldType;
+  vm: Pointer;
+  ColumnStr: String;
+  i, ColumnCount: Integer;
+  AType: TFieldType;
 begin
   {$ifdef DEBUG}
   WriteLn('##TSqlite3Dataset.InternalInitFieldDefs##');
   {$endif}
-  FAutoIncFieldNo:=-1;
+  FAutoIncFieldNo := -1;
   FieldDefs.Clear;
   FReturnCode := sqlite3_prepare(FSqliteHandle, PChar(FSql), -1, @vm, nil);
   if FReturnCode <> SQLITE_OK then
     DatabaseError(ReturnString, Self);
   sqlite3_step(vm);
-  ColumnCount:=sqlite3_column_count(vm);
+  ColumnCount := sqlite3_column_count(vm);
   //Set BufferSize
-  FRowBufferSize:=(SizeOf(PPChar)*ColumnCount);
+  FRowBufferSize := (SizeOf(PPChar) * ColumnCount);
   //Prepare the array of pchar2sql functions
-  SetLength(FGetSqlStr,ColumnCount);
+  SetLength(FGetSqlStr, ColumnCount);
   for i := 0 to ColumnCount - 1 do
   begin
-   ColumnStr := UpperCase(String(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(String(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;
      end
      else
        AType := ftInteger;     
-   end else if Pos('VARCHAR',ColumnStr) = 1 then
+   end else if Pos('VARCHAR', ColumnStr) = 1 then
    begin
      AType := ftString;
-   end else if Pos('BOOL',ColumnStr) = 1 then
+   end else if Pos('BOOL', ColumnStr) = 1 then
    begin
      AType := ftBoolean;
-   end else if Pos('AUTOINC',ColumnStr) = 1 then
+   end else if Pos('AUTOINC', ColumnStr) = 1 then
    begin
      AType := ftAutoInc;
      if FAutoIncFieldNo = -1 then
        FAutoIncFieldNo := i;
-   end else if (Pos('FLOAT',ColumnStr)=1) or (Pos('NUMERIC',ColumnStr)=1) then
+   end else if (Pos('FLOAT', ColumnStr) = 1) or (Pos('NUMERIC', ColumnStr) = 1) then
    begin
      AType := ftFloat;
    end else if (ColumnStr = 'DATETIME') then
@@ -219,27 +221,34 @@ begin
    end else if (ColumnStr = 'WORD') then
    begin
      AType := ftWord;
+   end else if (ColumnStr = '') then
+   begin
+     case sqlite3_column_type(vm, i) of
+       SQLITE_INTEGER:
+         AType := ftInteger;
+       SQLITE_FLOAT:
+         AType := ftFloat;
+     else
+       AType := ftString;
+     end;
    end else
    begin
      AType := ftString;
    end;
-   if AType = ftString then
-     FieldDefs.Add(String(sqlite3_column_name(vm,i)), AType, dsMaxStringSize)
-   else
-     FieldDefs.Add(String(sqlite3_column_name(vm,i)), AType);  
+   FieldDefs.Add(String(sqlite3_column_name(vm, i)), AType, FieldSizeMap[AType = ftString]);
    //Set the pchar2sql function
-   if AType in [ftString,ftMemo] then
-     FGetSqlStr[i]:=@Char2SqlStr
+   if AType in [ftString, ftMemo] then
+     FGetSqlStr[i] := @Char2SqlStr
    else
-     FGetSqlStr[i]:=@Num2SqlStr;
+     FGetSqlStr[i] := @Num2SqlStr;
    {$ifdef DEBUG}
-   writeln('  Field[',i,'] Name: ',sqlite3_column_name(vm,i));
-   writeln('  Field[',i,'] Type: ',sqlite3_column_decltype(vm,i));
+   writeln('  Field[',i,'] Name: ', sqlite3_column_name(vm,i));
+   writeln('  Field[',i,'] Type: ', sqlite3_column_decltype(vm,i));
    {$endif}
   end;
   sqlite3_finalize(vm);
   {$ifdef DEBUG}
-  writeln('  FieldDefs.Count: ',FieldDefs.Count);
+  writeln('  FieldDefs.Count: ', FieldDefs.Count);
   {$endif}
 end;