* PChar -> PAnsichar

packages/sqlite/src/sqlite.pp

@@ -98,63 +98,63 @@ Type
 
   // Procedural types used in functions.
 
-  sqlite_callback = function (_para1:pointer; _para2:longint; _para3:PPchar; _para4:PPchar):longint;cdecl;
-  sqlite_trace_func = procedure (_para1:pointer; _para2:Pchar);cdecl;
-  sqlite_create_func = procedure (_para1:Psqlite_func; _para2:longint; _para3:PPchar);cdecl;
-  sqlite_handler = function (_para1:pointer; _para2:Pchar; _para3:longint):longint;cdecl;
-  sqlite_step_func = procedure (_para1:Psqlite_func; _para2:longint; _para3:PPchar);cdecl;
+  sqlite_callback = function (_para1:pointer; _para2:longint; _para3:PPAnsiChar; _para4:PPAnsiChar):longint;cdecl;
+  sqlite_trace_func = procedure (_para1:pointer; _para2:PAnsiChar);cdecl;
+  sqlite_create_func = procedure (_para1:Psqlite_func; _para2:longint; _para3:PPAnsiChar);cdecl;
+  sqlite_handler = function (_para1:pointer; _para2:PAnsiChar; _para3:longint):longint;cdecl;
+  sqlite_step_func = procedure (_para1:Psqlite_func; _para2:longint; _para3:PPAnsiChar);cdecl;
   sqlite_finalize_func = procedure (_para1:Psqlite_func);cdecl;
-  sqlite_authorize_func = function (_para1:pointer; _para2:longint; _para3, _para4,_para5,_para6:Pchar):longint;cdecl;
+  sqlite_authorize_func = function (_para1:pointer; _para2:longint; _para3, _para4,_para5,_para6:PAnsiChar):longint;cdecl;
 
-  function sqlite_create_function(_para1:Psqlite; zName:Pchar; nArg:longint; xFunc:sqlite_create_func; pUserData:pointer):longint;cdecl;external External_library name 'sqlite_create_function';
-  function sqlite_open(filename:Pchar; mode:longint; errmsg:PPchar):Psqlite;cdecl;external External_library name 'sqlite_open';
+  function sqlite_create_function(_para1:Psqlite; zName:PAnsiChar; nArg:longint; xFunc:sqlite_create_func; pUserData:pointer):longint;cdecl;external External_library name 'sqlite_create_function';
+  function sqlite_open(filename:PAnsiChar; mode:longint; errmsg:PPAnsiChar):Psqlite;cdecl;external External_library name 'sqlite_open';
   procedure sqlite_close(_para1:Psqlite);cdecl;external External_library name 'sqlite_close';
-  function sqlite_exec(_para1:Psqlite; sql:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar):longint;cdecl;external External_library name 'sqlite_exec';
+  function sqlite_exec(_para1:Psqlite; sql:PAnsiChar; _para3:sqlite_callback; _para4:pointer; errmsg:PPAnsiChar):longint;cdecl;external External_library name 'sqlite_exec';
   function sqlite_last_insert_rowid(_para1:Psqlite):longint;cdecl;external External_library name 'sqlite_last_insert_rowid';
   function sqlite_changes(_para1:Psqlite):longint;cdecl;external External_library name 'sqlite_changes';
-  function sqlite_error_string(_para1:longint):Pchar;cdecl;external External_library name 'sqlite_error_string';
+  function sqlite_error_string(_para1:longint):PAnsiChar;cdecl;external External_library name 'sqlite_error_string';
   procedure do_sqlite_interrupt(_para1:Psqlite);cdecl;external External_library name 'sqlite_interrupt';
-  function sqlite_complete(sql:Pchar):longint;cdecl;external External_library name 'sqlite_complete';
+  function sqlite_complete(sql:PAnsiChar):longint;cdecl;external External_library name 'sqlite_complete';
   procedure sqlite_busy_handler(_para1:Psqlite; _para2:sqlite_handler; _para3:pointer);cdecl;external External_library name 'sqlite_busy_handler';
   procedure sqlite_busy_timeout(_para1:Psqlite; ms:longint);cdecl;external External_library name 'sqlite_busy_timeout';
-  function sqlite_get_table(_para1:Psqlite; sql:Pchar; resultp:PPPchar; nrow:Plongint; ncolumn:Plongint;
-             errmsg:PPchar):longint;cdecl;external External_library name 'sqlite_get_table';
-  procedure sqlite_free_table(result:PPchar);cdecl;external External_library name 'sqlite_free_table';
-  function sqlite_exec_printf(_para1:Psqlite; sqlFormat:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar;
+  function sqlite_get_table(_para1:Psqlite; sql:PAnsiChar; resultp:PPPAnsiChar; nrow:Plongint; ncolumn:Plongint;
+             errmsg:PPAnsiChar):longint;cdecl;external External_library name 'sqlite_get_table';
+  procedure sqlite_free_table(result:PPAnsiChar);cdecl;external External_library name 'sqlite_free_table';
+  function sqlite_exec_printf(_para1:Psqlite; sqlFormat:PAnsiChar; _para3:sqlite_callback; _para4:pointer; errmsg:PPAnsiChar;
              args:array of const):longint;cdecl;external External_library name 'sqlite_exec_printf';
-  function sqlite_exec_printf(_para1:Psqlite; sqlFormat:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar):longint;cdecl;varargs;external External_library name 'sqlite_exec_printf';
-  function sqlite_exec_vprintf(_para1:Psqlite; sqlFormat:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar;
+  function sqlite_exec_printf(_para1:Psqlite; sqlFormat:PAnsiChar; _para3:sqlite_callback; _para4:pointer; errmsg:PPAnsiChar):longint;cdecl;varargs;external External_library name 'sqlite_exec_printf';
+  function sqlite_exec_vprintf(_para1:Psqlite; sqlFormat:PAnsiChar; _para3:sqlite_callback; _para4:pointer; errmsg:PPAnsiChar;
              ap:array of const):longint;cdecl;external External_library name 'sqlite_exec_vprintf';
-  function sqlite_get_table_printf(_para1:Psqlite; sqlFormat:Pchar; resultp:PPPchar; nrow:Plongint; ncolumn:Plongint;
-             errmsg:PPchar; args:array of const):longint;cdecl;external External_library name 'sqlite_get_table_printf';
-  function sqlite_get_table_printf(_para1:Psqlite; sqlFormat:Pchar; resultp:PPPchar; nrow:Plongint; ncolumn:Plongint;
-             errmsg:PPchar):longint;cdecl;varargs;external External_library name 'sqlite_get_table_printf';
-  function sqlite_get_table_vprintf(_para1:Psqlite; sqlFormat:Pchar; resultp:PPPchar; nrow:Plongint; ncolumn:Plongint;
-             errmsg:PPchar; ap:array of const):longint;cdecl;external External_library name 'sqlite_get_table_vprintf';
-  function sqlite_mprintf(_para1:Pchar; args:array of const):Pchar;cdecl;external External_library name 'sqlite_mprintf';
-  function sqlite_mprintf(_para1:Pchar):Pchar;cdecl;varargs;external External_library name 'sqlite_mprintf';
+  function sqlite_get_table_printf(_para1:Psqlite; sqlFormat:PAnsiChar; resultp:PPPAnsiChar; nrow:Plongint; ncolumn:Plongint;
+             errmsg:PPAnsiChar; args:array of const):longint;cdecl;external External_library name 'sqlite_get_table_printf';
+  function sqlite_get_table_printf(_para1:Psqlite; sqlFormat:PAnsiChar; resultp:PPPAnsiChar; nrow:Plongint; ncolumn:Plongint;
+             errmsg:PPAnsiChar):longint;cdecl;varargs;external External_library name 'sqlite_get_table_printf';
+  function sqlite_get_table_vprintf(_para1:Psqlite; sqlFormat:PAnsiChar; resultp:PPPAnsiChar; nrow:Plongint; ncolumn:Plongint;
+             errmsg:PPAnsiChar; ap:array of const):longint;cdecl;external External_library name 'sqlite_get_table_vprintf';
+  function sqlite_mprintf(_para1:PAnsiChar; args:array of const):PAnsiChar;cdecl;external External_library name 'sqlite_mprintf';
+  function sqlite_mprintf(_para1:PAnsiChar):PAnsiChar;cdecl;varargs;external External_library name 'sqlite_mprintf';
   procedure sqlite_freemem(p:pointer);cdecl;external External_library name 'sqlite_freemem';
-  function sqlite_libversion:Pchar;cdecl;external External_library name 'sqlite_libversion';
-  function sqlite_libencoding:Pchar;cdecl;external External_library name 'sqlite_libencoding';
-  function sqlite_create_aggregate(_para1:Psqlite; zName:Pchar; nArg:longint; xStep:sqlite_step_func ; xFinalize:sqlite_finalize_func;
+  function sqlite_libversion:PAnsiChar;cdecl;external External_library name 'sqlite_libversion';
+  function sqlite_libencoding:PAnsiChar;cdecl;external External_library name 'sqlite_libencoding';
+  function sqlite_create_aggregate(_para1:Psqlite; zName:PAnsiChar; nArg:longint; xStep:sqlite_step_func ; xFinalize:sqlite_finalize_func;
              pUserData:pointer):longint;cdecl;external External_library name 'sqlite_create_aggregate';
-  function sqlite_function_type(db:Psqlite; zName:Pchar; datatype:longint):longint;cdecl;external External_library name 'sqlite_function_type';
-  function sqlite_set_result_string(_para1:Psqlite_func; _para2:Pchar; _para3:longint):Pchar;cdecl;external External_library name 'sqlite_set_result_string';
+  function sqlite_function_type(db:Psqlite; zName:PAnsiChar; datatype:longint):longint;cdecl;external External_library name 'sqlite_function_type';
+  function sqlite_set_result_string(_para1:Psqlite_func; _para2:PAnsiChar; _para3:longint):PAnsiChar;cdecl;external External_library name 'sqlite_set_result_string';
   procedure sqlite_set_result_int(_para1:Psqlite_func; _para2:longint);cdecl;external External_library name 'sqlite_set_result_int';
   procedure sqlite_set_result_double(_para1:Psqlite_func; _para2:double);cdecl;external External_library name 'sqlite_set_result_double';
-  procedure sqlite_set_result_error(_para1:Psqlite_func; _para2:Pchar; _para3:longint);cdecl;external External_library name 'sqlite_set_result_error';
+  procedure sqlite_set_result_error(_para1:Psqlite_func; _para2:PAnsiChar; _para3:longint);cdecl;external External_library name 'sqlite_set_result_error';
   function sqlite_user_data(_para1:Psqlite_func):pointer;cdecl;external External_library name 'sqlite_user_data';
   function sqlite_aggregate_context(_para1:Psqlite_func; nBytes:longint):pointer;cdecl;external External_library name 'sqlite_aggregate_context';
   function sqlite_aggregate_count(_para1:Psqlite_func):longint;cdecl;external External_library name 'sqlite_aggregate_count';
   function sqlite_set_authorizer(_para1:Psqlite; xAuth:sqlite_authorize_func ; pUserData:pointer):longint;cdecl;external External_library name 'sqlite_set_authorizer';
   function sqlite_trace(_para1:Psqlite; xTrace:sqlite_trace_func; _para3:pointer):pointer;cdecl;external External_library name 'sqlite_trace';
-  function sqlite_compile(db:Psqlite; zSql:Pchar; pzTail:PPchar; ppVm:PPsqlite_vm; pzErrmsg:PPchar):longint;cdecl;external External_library name 'sqlite_compile';
-  function sqlite_step(pVm:Psqlite_vm; pN:Plongint; pazValue:PPPchar; pazColName:PPPchar):longint;cdecl;external External_library name 'sqlite_step';
-  function sqlite_finalize(_para1:Psqlite_vm; pzErrMsg:PPchar):longint;cdecl;external External_library name 'sqlite_finalize';
+  function sqlite_compile(db:Psqlite; zSql:PAnsiChar; pzTail:PPAnsiChar; ppVm:PPsqlite_vm; pzErrmsg:PPAnsiChar):longint;cdecl;external External_library name 'sqlite_compile';
+  function sqlite_step(pVm:Psqlite_vm; pN:Plongint; pazValue:PPPAnsiChar; pazColName:PPPAnsiChar):longint;cdecl;external External_library name 'sqlite_step';
+  function sqlite_finalize(_para1:Psqlite_vm; pzErrMsg:PPAnsiChar):longint;cdecl;external External_library name 'sqlite_finalize';
   
   //Use functions instead of external variables to retrieve version and encoding info
-  function sqlite_version: PChar external External_library name 'sqlite_libversion';
-  function sqlite_encoding: PChar external External_library name 'sqlite_libencoding';
+  function sqlite_version: PAnsiChar external External_library name 'sqlite_libversion';
+  function sqlite_encoding: PAnsiChar external External_library name 'sqlite_libencoding';
   
 implementation
 

packages/sqlite/src/sqlite3.inc

@@ -40,7 +40,7 @@ const
   Header converted from Sqlite version 3.14.2
 }
 
-//SQLITE_EXTERN const char sqlite3_version[];
+//SQLITE_EXTERN const AnsiChar sqlite3_version[];
 {$IFDEF S}function{$ELSE}var{$ENDIF}sqlite3_libversion{$IFDEF D}: function{$ENDIF}(): pansichar; cdecl;{$IFDEF S}external Sqlite3Lib;{$ENDIF}
 {$IFDEF S}function{$ELSE}var{$ENDIF}sqlite3_libversion_number{$IFDEF D}: function{$ENDIF}(): cint; cdecl;{$IFDEF S}external Sqlite3Lib;{$ENDIF}
 function sqlite3_version(): pansichar;
@@ -435,9 +435,9 @@ type
 ): cint; cdecl;{$IFDEF S}external Sqlite3Lib;{$ENDIF}
 
 {$IFDEF S}procedure{$ELSE}var{$ENDIF}sqlite3_free_table{$IFDEF D}: procedure{$ENDIF}(result: ppansichar); cdecl;{$IFDEF S}external Sqlite3Lib;{$ENDIF}
-//char *sqlite3_mprintf(const char*,...);
-//char *sqlite3_vmprintf(const char*, va_list);
-//char *sqlite3_snprintf(int,char*,const char*, ...);
+//AnsiChar *sqlite3_mprintf(const AnsiChar*,...);
+//AnsiChar *sqlite3_vmprintf(const AnsiChar*, va_list);
+//AnsiChar *sqlite3_snprintf(int,AnsiChar*,const AnsiChar*, ...);
 
 {$IFDEF S}function{$ELSE}var{$ENDIF}sqlite3_malloc{$IFDEF D}: function{$ENDIF}(size: cint): pointer;cdecl;{$IFDEF S}external Sqlite3Lib;{$ENDIF}
 {$IFDEF S}function{$ELSE}var{$ENDIF}sqlite3_malloc64{$IFDEF D}: function{$ENDIF}(size: sqlite3_uint64): pointer;cdecl;{$IFDEF S}external Sqlite3Lib;{$ENDIF}
@@ -891,17 +891,17 @@ type
     iVersion     : cint;
    // xCreate      : function(db: psqlite3; pAux: pointer; argc: cint; ): cint; cdecl;
   cint (*xCreate)(db: psqlite3; void *pAux;
-               cint argc; const char *const*argv;
-               sqlite3_vtab **ppVTab; char**);
+               cint argc; const AnsiChar *const*argv;
+               sqlite3_vtab **ppVTab; AnsiChar**);
   cint (*xConnect)(db: psqlite3; void *pAux;
-               cint argc; const char *const*argv;
-               sqlite3_vtab **ppVTab; char**);
+               cint argc; const AnsiChar *const*argv;
+               sqlite3_vtab **ppVTab; AnsiChar**);
   cint (*xBestIndex)(sqlite3_vtab *pVTab; sqlite3_index_info*);
   cint (*xDisconnect)(sqlite3_vtab *pVTab);
   cint (*xDestroy)(sqlite3_vtab *pVTab);
   cint (*xOpen)(sqlite3_vtab *pVTab; sqlite3_vtab_cursor **ppCursor);
   cint (*xClose)(sqlite3_vtab_cursor*);
-  cint (*xFilter)(sqlite3_vtab_cursor*; cint idxNum; const char *idxStr;
+  cint (*xFilter)(sqlite3_vtab_cursor*; cint idxNum; const AnsiChar *idxStr;
                 cint argc; sqlite3_value **argv);
     xNext         : function(pVCurs: sqlite3_vtab_cursor): cint; cdecl;
     xEof          : function(pVCurs: sqlite3_vtab_cursor): cint; cdecl;
@@ -922,21 +922,21 @@ type
   psqlite3_index_constracint = ^sqlite3_index_constracint;
   sqlite3_index_constracint = record
      iColumn: cint;              (* Column constrained.  -1 for ROWID *)
-     op: char;                   (* Constracint operator *)
-     usable: char;               (* True if this constracint is usable *)
+     op: AnsiChar;                   (* Constracint operator *)
+     usable: AnsiChar;               (* True if this constracint is usable *)
      iTermOffset: cint;          (* Used cinternally - xBestIndex should ignore *)
   end;
 
   psqlite3_index_orderby = ^sqlite3_index_orderby;
   sqlite3_index_orderby = record
      iColumn: cint;              (* Column number *)
-     desc: char;                 (* True for DESC.  False for ASC. *)
+     desc: AnsiChar;                 (* True for DESC.  False for ASC. *)
   end;
 
   psqlite3_index_constracint_usage = ^sqlite3_index_constracint_usage;
   sqlite3_index_constracint_usage = record
     argvIndex: cint;             (* if >0; constracint is part of argv to xFilter *)
-    omit: char;                  (* Do not code a test for this constracint *)
+    omit: AnsiChar;                  (* Do not code a test for this constracint *)
   end;
 
   psqlite3_index_info = ^sqlite3_index_info;

packages/sqlite/src/sqlite3db.pas

@@ -14,9 +14,9 @@ uses  Classes,strings,sqlite3;
 {*************************************************************}
 {*************************************************************}
 type
-   TSQLiteExecCallback = function(Sender: pointer; Columns: Integer; ColumnValues: ppchar; ColumnNames: ppchar): integer of object; cdecl;
+   TSQLiteExecCallback = function(Sender: pointer; Columns: Integer; ColumnValues: PPAnsiChar; ColumnNames: PPAnsiChar): integer of object; cdecl;
    TSQLiteBusyCallback = function(Sender: TObject; BusyCount: integer): longint of object; cdecl;
-   TOnData = Procedure(Sender: TObject; Columns: Integer; ColumnNames, ColumnValues: String)  of object;
+   TOnData = Procedure(Sender: TObject; Columns: Integer; ColumnNames, ColumnValues: AnsiString)  of object;
    TOnBusy = Procedure(Sender: TObject; BusyCount: integer; var Cancel: Boolean) of object;
    TOnQueryComplete = Procedure(Sender: TObject) of object;
 
@@ -31,12 +31,12 @@ type
      end;
    var
    fSQLite:Psqlite3;
-   fMsg: String;
+   fMsg: AnsiString;
    fIsOpen: Boolean;
    fBusy: Boolean;
    fError: longint;
-   fVersion: String;
-   fEncoding: String;
+   fVersion: AnsiString;
+   fEncoding: AnsiString;
    fTable: TStrings;
    fLstName: TStringList;
    fLstVal: TStringList;
@@ -53,18 +53,18 @@ type
 {*************************************************************}
 {*************************************************************}   
    public
-   constructor Create(const DBFileName: String);
+   constructor Create(const DBFileName: AnsiString);
    destructor Destroy; override;
-   function Query(const Sql: String; Table: TStrings ): boolean;
-   function ErrorMessage(ErrNo: Integer): string;
-   function IsComplete(Sql: String): boolean;
+   function Query(const Sql: AnsiString; Table: TStrings ): boolean;
+   function ErrorMessage(ErrNo: Integer): AnsiString;
+   function IsComplete(Sql: AnsiString): boolean;
    function LastInsertRow: integer;
    function Cancel: boolean;
    function DatabaseDetails(Table: TStrings): boolean;
-   property LastErrorMessage: string read fMsg;
+   property LastErrorMessage: AnsiString read fMsg;
    property LastError: longint read fError;
-   property Version: String read fVersion;
-   property Encoding: String read fEncoding;
+   property Version: AnsiString read fVersion;
+   property Encoding: AnsiString read fEncoding;
    property OnData: TOnData read fOnData write fOnData;
    property OnBusy: TOnBusy read fOnBusy write fOnBusy;
    property OnQueryComplete: TOnQueryComplete read fOnQueryComplete write fOnQueryComplete;
@@ -73,37 +73,37 @@ type
    property List_FieldName: TStringList read fList_FieldName;
    property List_Field: TList read fList_Field;
    property Nb_Champ: integer read fNb_Champ write fNb_Champ;
-   procedure SQLOnData(Sender: TObject; Columns: Integer; ColumnNames, ColumnValues: String);
+   procedure SQLOnData(Sender: TObject; Columns: Integer; ColumnNames, ColumnValues: AnsiString);
  end;
 
-function Pas2SQLStr(const PasString: string): string;
-function SQL2PasStr(const SQLString: string): string;
-function QuoteStr(const s: string; QuoteChar: Char ): string;
-function UnQuoteStr(const s: string; QuoteChar: Char ): string;
-procedure ValueList(const ColumnNames, ColumnValues: String; NameValuePairs: TStrings);
+function Pas2SQLStr(const PasString: AnsiString): AnsiString;
+function SQL2PasStr(const SQLString: AnsiString): AnsiString;
+function QuoteStr(const s: AnsiString; QuoteChar: AnsiChar ): AnsiString;
+function UnQuoteStr(const s: AnsiString; QuoteChar: AnsiChar ): AnsiString;
+procedure ValueList(const ColumnNames, ColumnValues: AnsiString; NameValuePairs: TStrings);
 {*************************************************************}
 {*************************************************************}
 implementation
 Const
-   DblQuote: Char      = '"';
-   SngQuote: Char      = #39;
-   DblSngQuote: String = #39#39;
-   Crlf: String	       = #13#10;
-   Tab: Char	       = #9;
+   DblQuote: AnsiChar      = '"';
+   SngQuote: AnsiChar      = #39;
+   DblSngQuote: AnsiString = #39#39;
+   Crlf: AnsiString	       = #13#10;
+   Tab: AnsiChar	       = #9;
 var
-   MsgNoError : String;
+   MsgNoError : AnsiString;
 {*************************************************************}
 {*************************************************************}
-function QuoteStr(const s: string; QuoteChar: Char ): string;
+function QuoteStr(const s: AnsiString; QuoteChar: AnsiChar ): AnsiString;
 {*************************************************************
-SQlite3 enclosing string with quotes
+SQlite3 enclosing AnsiString with quotes
 G. Marcou
 *************************************************************}
 begin
    Result := Concat(QuoteChar, s, QuoteChar);
 end;
 {*************************************************************}
-function UnQuoteStr(const s: string; QuoteChar: Char ): string;
+function UnQuoteStr(const s: AnsiString; QuoteChar: AnsiChar ): AnsiString;
 {*************************************************************
 SQlite3 Remove enclosing quotes from string
 G. Marcou
@@ -119,7 +119,7 @@ begin
    end;
 end;
 {*************************************************************}
-function Pas2SQLStr(const PasString: string): string;
+function Pas2SQLStr(const PasString: AnsiString): AnsiString;
 {*************************************************************
 SQlite3 SQL string are use double quotes, Pascal string use
 single quote.
@@ -139,7 +139,7 @@ begin
    Result := QuoteStr(Result,SngQuote);
 end;
 {*************************************************************}
-function SQL2PasStr(const SQLString: string): string;
+function SQL2PasStr(const SQLString: AnsiString): AnsiString;
 {*************************************************************
 SQlite3 SQL string are use double quotes, Pascal string use
 single quote.
@@ -158,7 +158,7 @@ begin
    Result := UnQuoteStr(Result,SngQuote);
 end;
 {*************************************************************}
-procedure ValueList(const ColumnNames, ColumnValues : String;
+procedure ValueList(const ColumnNames, ColumnValues : AnsiString;
 NameValuePairs					    : TStrings);
 {*************************************************************
 SQlite3 build (name=value) pair list
@@ -184,9 +184,9 @@ begin
    end;
 end;
 {*************************************************************}
-{function SystemErrorMsg(ErrNo: Integer ): String;
+{function SystemErrorMsg(ErrNo: Integer ): AnsiString;
 var
-  buf: PChar;
+  buf: PAnsiChar;
   size: Integer;
   MsgLen: Integer;
 begin}
@@ -225,16 +225,16 @@ end;
 {*************************************************************}
 function ExecCallback(Sender : Pointer;
 Columns			     : Integer;
-ColumnValues		     : PPChar;
-ColumnNames		     : PPchar): integer; cdecl;
+ColumnValues		     : PPAnsiChar;
+ColumnNames		     : PPAnsiChar): integer; cdecl;
 {*************************************************************
 SQlite3 Build table and data from callback
 G. Marcou
 *************************************************************}
 var
-   PVal, PName : ^PChar;
+   PVal, PName : ^PAnsiChar;
    n	       : integer;
-   sVal, sName : String;
+   sVal, sName : AnsiString;
 begin
    Result := 0;
    with TObject(Sender) as TSQLite do
@@ -271,16 +271,16 @@ end;
 {*************************************************************}
 procedure TSQLite.SQLOnData(Sender : TObject;
 Columns				   : Integer;
-ColumnNames, ColumnValues	   : String);
+ColumnNames, ColumnValues	   : AnsiString);
 {*************************************************************
 SQlite3 Fill up field list names and field list values
 G. Marcou
 *************************************************************}
 Var
-   InterS,val : String;
+   InterS,val : AnsiString;
    Field      : TStringList;
    {************************************************}
-   function Pos1(a: String ; s : char) : integer;
+   function Pos1(a: AnsiString ; s : AnsiChar) : integer;
    var i,j : Integer;
    begin
       j:=-1;
@@ -331,7 +331,7 @@ begin
 end;
 
 {*************************************************************}
-constructor TSQLite.Create(const DBFileName: String);
+constructor TSQLite.Create(const DBFileName: AnsiString);
 {*************************************************************
 SQlite3 constructor
 G. Marcou
@@ -383,14 +383,14 @@ begin
    inherited Destroy;
 end;
 {*************************************************************}
-function TSQLite.Query(const Sql: String; Table: TStrings ): boolean;
+function TSQLite.Query(const Sql: AnsiString; Table: TStrings ): boolean;
 {*************************************************************
 SQLite3 query the database
 G. Marcou
 *************************************************************}
 //var
-//  fPMsg: PChar;
-//var Psql : pchar;
+//  fPMsg: PAnsiChar;
+//var Psql : PAnsiChar;
 begin
    fError := SQLITE_ERROR;
    if fIsOpen then
@@ -459,7 +459,7 @@ begin
     Result := -1;
 end;
 {*************************************************************}
-function TSQLite.ErrorMessage(ErrNo: Integer): string;
+function TSQLite.ErrorMessage(ErrNo: Integer): AnsiString;
 {*************************************************************
 SQLite3 Return comprehensive error message
 G. Marcou
@@ -471,12 +471,12 @@ begin
     Result := sqlite3_errmsg(fSQLite);
 end;
 {*************************************************************}
-function TSQLite.IsComplete(Sql: String): boolean;
+function TSQLite.IsComplete(Sql: AnsiString): boolean;
 {*************************************************************
 SQLite3 Return true when complete
 G. Marcou
 *************************************************************}
-var Psql : pchar;
+var Psql : PAnsiChar;
 begin
    Psql:=StrAlloc (length(Sql)+1);
    strpcopy(Psql,Sql);

packages/sqlite/src/sqlitedb.pas

@@ -8,8 +8,8 @@ interface
 uses  Classes,strings,sqlite;
 
 type
-  TSQLiteExecCallback = function(Sender: pointer; Columns: Integer; ColumnValues: ppchar; ColumnNames: ppchar): integer of object; cdecl;
-  TSQLiteBusyCallback = function(Sender: TObject; ObjectName: PChar; BusyCount: integer): integer of object; cdecl;
+  TSQLiteExecCallback = function(Sender: pointer; Columns: Integer; ColumnValues: PPAnsiChar; ColumnNames: PPAnsiChar): integer of object; cdecl;
+  TSQLiteBusyCallback = function(Sender: TObject; ObjectName: PAnsiChar; BusyCount: integer): integer of object; cdecl;
   TOnData = Procedure(Sender: TObject; Columns: Integer; ColumnNames, ColumnValues: String)  of object;
   TOnBusy = Procedure(Sender: TObject; ObjectName: String; BusyCount: integer; var Cancel: Boolean) of object;
   TOnQueryComplete = Procedure(Sender: TObject) of object;
@@ -30,7 +30,7 @@ type
     fOnBusy: TOnBusy;
     fOnQueryComplete: TOnQueryComplete;
     fBusyTimeout: integer;
-    fPMsg: PChar;
+    fPMsg: PAnsiChar;
     fChangeCount: integer;
         fNb_Champ :  Integer;
         fList_FieldName : TStringList;
@@ -63,27 +63,27 @@ type
   end;
   function Pas2SQLStr(const PasString: string): string;
   function SQL2PasStr(const SQLString: string): string;
-  function QuoteStr(const s: string; QuoteChar: Char ): string;
-  function UnQuoteStr(const s: string; QuoteChar: Char ): string;
+  function QuoteStr(const s: string; QuoteChar: AnsiChar ): string;
+  function UnQuoteStr(const s: string; QuoteChar: AnsiChar ): string;
   procedure ValueList(const ColumnNames, ColumnValues: String; NameValuePairs: TStrings);
 
 implementation
 
 Const
-  DblQuote: Char    = '"';
-  SngQuote: Char    = #39;
+  DblQuote: AnsiChar    = '"';
+  SngQuote: AnsiChar    = #39;
   Crlf: String      = #13#10;
-  Tab: Char         = #9;
+  Tab: AnsiChar         = #9;
 
 var
   MsgNoError: String;
 
-function QuoteStr(const s: string; QuoteChar: Char ): string;
+function QuoteStr(const s: string; QuoteChar: AnsiChar ): string;
 begin
   Result := Concat(QuoteChar, s, QuoteChar);
 end;
 
-function UnQuoteStr(const s: string; QuoteChar: Char ): string;
+function UnQuoteStr(const s: string; QuoteChar: AnsiChar ): string;
 begin
   Result := s;
   if length(Result) > 1 then
@@ -151,7 +151,7 @@ end;
 
 function SystemErrorMsg(ErrNo: Integer ): String;
 var
-  buf: PChar;
+  buf: PAnsiChar;
   size: Integer;
   MsgLen: Integer;
 begin
@@ -166,7 +166,7 @@ begin
     Result := buf;}
 end;
 
-function BusyCallback(Sender: pointer; ObjectName: PChar; BusyCount: integer): integer; cdecl;
+function BusyCallback(Sender: pointer; ObjectName: PAnsiChar; BusyCount: integer): integer; cdecl;
 var
   sObjName: String;
   bCancel: Boolean;
@@ -185,9 +185,9 @@ begin
   end;
 end;
 
-function ExecCallback(Sender: Pointer; Columns: Integer; ColumnValues: PPChar; ColumnNames: PPchar): integer; cdecl;
+function ExecCallback(Sender: Pointer; Columns: Integer; ColumnValues: PPAnsiChar; ColumnNames: PPAnsiChar): integer; cdecl;
 var
-  PVal, PName: ^PChar;
+  PVal, PName: ^PAnsiChar;
   n: integer;
   sVal, sName: String;
 begin
@@ -230,7 +230,7 @@ Var i : Integer;
           InterS,val : String;
           Field : TStringList;
 
-          function Pos1(a: String ; s : char) : integer;
+          function Pos1(a: String ; s : AnsiChar) : integer;
           var i,j : Integer;
 
           begin
@@ -273,8 +273,8 @@ end;
 
 constructor TSQLite.Create(DBFileName: String);
 var
-  fPMsg1: PChar;
-  name : pchar;
+  fPMsg1: PAnsiChar;
+  name : PAnsiChar;
 begin
   inherited Create;
   List_FieldName := TStringList.Create;
@@ -322,8 +322,8 @@ end;
 
 function TSQLite.Query(Sql: String; Table: TStrings ): boolean;
 //var
-//  fPMsg: PChar;
-//var Psql : pchar;
+//  fPMsg: PAnsiChar;
+//var Psql : PAnsiChar;
 begin
   fError := SQLITE_ERROR;
   if fIsOpen then
@@ -336,7 +336,7 @@ begin
    List_FieldName.clear;
    List_Field.clear;
    Nb_Champ:=-1;
-    fError := SQLite_Exec(fSQLite, PChar(sql), @ExecCallback, Self, @fPMsg);
+    fError := SQLite_Exec(fSQLite, PAnsiChar(sql), @ExecCallback, Self, @fPMsg);
     SQLite_FreeMem(fPMsg);
     fChangeCount := SQLite_Changes(fSQLite);
     fTable := nil;
@@ -389,7 +389,7 @@ begin
 end;
 
 function TSQLite.IsComplete(Sql: String): boolean;
-var Psql : pchar;
+var Psql : PAnsiChar;
 begin
   Psql:=StrAlloc (length(Sql)+1);
   strpcopy(Psql,Sql);

packages/sqlite/tests/testapiv3x.pp

@@ -11,12 +11,12 @@ const
 var
  rc       : Integer;
  db       : Psqlite3;
- sql      : string;
- pzErrMsg : PChar;
+ sql      : ansistring;
+ pzErrMsg : PAnsiChar;
  
-function MyCallback(_para1:pointer; plArgc:longint; argv:PPchar; argcol:PPchar):longint; cdecl;
+function MyCallback(_para1:pointer; plArgc:longint; argv:PPAnsiChar; argcol:PPAnsiChar):longint; cdecl;
 var i: Integer;
-    PVal, PName: ^PChar;
+    PVal, PName: ^PAnsiChar;
 begin
  PVal:=argv;
  PName:=argcol;
@@ -31,48 +31,48 @@ end;
 
 begin
   writeln(Format('SQLite version : %d',[sqlite3_libversion_number]));
-  rc := sqlite3_open(PChar(DBFILE), @db);
+  rc := sqlite3_open(PAnsiChar(DBFILE), @db);
   try
    if rc<>SQLITE_OK then begin
     writeln(Format('Can''t open database: %s',[DBFILE]));
    end;
 
    sql:= 'DROP TABLE Test;';
-   rc:=sqlite3_exec(db, PChar(sql), @MyCallback, nil, @pzErrMsg);
+   rc:=sqlite3_exec(db, PAnsiChar(sql), @MyCallback, nil, @pzErrMsg);
    if( rc<>SQLITE_OK )
    then writeln(Format('SQL error: %s', [pzErrMsg^]));
 
    sql:='CREATE TABLE Test(No integer, name varchar(32),shortname varchar(32), age integer);';
-   rc:=sqlite3_exec(db, PChar(sql), @MyCallback, nil, @pzErrMsg);
+   rc:=sqlite3_exec(db, PAnsiChar(sql), @MyCallback, nil, @pzErrMsg);
    if( rc<>SQLITE_OK )
    then writeln(Format('SQL error: %s', [pzErrMsg^]));
    
    sql:='INSERT INTO Test VALUES(1,''hi'', ''by'', -1);';
-   rc:=sqlite3_exec(db, PChar(sql), @MyCallback, nil, @pzErrMsg);
+   rc:=sqlite3_exec(db, PAnsiChar(sql), @MyCallback, nil, @pzErrMsg);
    Writeln('Inserting row');
    if( rc<>SQLITE_OK )
    then writeln(Format('SQL error: %s', [pzErrMsg^]));
 
    SQL := 'INSERT INTO Test VALUES(2,''dualcore'', ''runwell'',-1);';
-   rc:=sqlite3_exec(db, PChar(sql), @MyCallback, nil, @pzErrMsg);
+   rc:=sqlite3_exec(db, PAnsiChar(sql), @MyCallback, nil, @pzErrMsg);
    Writeln('Inserting row') ;
    if( rc<>SQLITE_OK )
    then writeln(Format('SQL error: %s', [pzErrMsg^]));
 
    SQL := 'INSERT INTO Test VALUES(3,''Hello'', ''World'',NULL);';
-   rc:=sqlite3_exec(db, PChar(sql), @MyCallback, nil, @pzErrMsg);
+   rc:=sqlite3_exec(db, PAnsiChar(sql), @MyCallback, nil, @pzErrMsg);
    Writeln('Inserting row') ;
    if( rc<>SQLITE_OK )
    then writeln(Format('SQL error: %s', [pzErrMsg^]));
 
    SQL := 'INSERT INTO Test VALUES(4,''just a little'', ''test'',-1);';
-   rc:=sqlite3_exec(db, PChar(sql), @MyCallback, nil, @pzErrMsg);
+   rc:=sqlite3_exec(db, PAnsiChar(sql), @MyCallback, nil, @pzErrMsg);
    Writeln('Inserting row') ;
    if( rc<>SQLITE_OK )
    then writeln(Format('SQL error: %s', [pzErrMsg^]));
 
    SQL := 'select * from Test;';
-   rc:=sqlite3_exec(db, PChar(sql), @MyCallback, nil, @pzErrMsg);
+   rc:=sqlite3_exec(db, PAnsiChar(sql), @MyCallback, nil, @pzErrMsg);
    if( rc<>SQLITE_OK )
    then writeln(Format('SQL error: %s', [pzErrMsg^]));
   finally sqlite3_close(db); end;