ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/runtime/ibxscript.pas
(Generate patch)

Comparing ibx/trunk/runtime/ibxscript.pas (file contents):
Revision 47 by tony, Mon Jan 9 15:31:51 2017 UTC vs.
Revision 60 by tony, Mon Mar 27 15:21:02 2017 UTC

# Line 214 | Line 214 | type
214      function AnalyseXML(SymbolStream: TSymbolStream): string;
215      procedure NextStatement;
216      class function FormatBlob(Field: ISQLData): string;
217 <    class function FormatArray(ar: IArray): string;
217 >    class function FormatArray(Database: TIBDatabase; ar: IArray): string;
218      property BlobData[index: integer]: TBlobData read GetBlobData;
219      property BlobDataCount: integer read GetBlobDataCount;
220      property ArrayData[index: integer]: TArrayData read GetArrayData;
# Line 845 | Line 845 | begin
845    RegexObj := TRegExpr.Create;
846    try
847      {process create database}
848 <    RegexObj.Expression := '^ *CREATE +(DATABASE|SCHEMA) +(.*) *(\' + Terminator + '|)';
848 >    RegexObj.Expression := '^ *CREATE +(DATABASE|SCHEMA) +.*(\' + Terminator + '|)';
849      if RegexObj.Exec(ucStmt) then
850      begin
851        UpdateUserPassword;
# Line 948 | Line 948 | begin
948        else
949        if command = 'NAMES' then
950        begin
951 <        if FirebirdAPI.CharSetName2CharSetID(param,charsetid) then
951 >        if Database.Attachment.CharSetName2CharSetID(param,charsetid) then
952          begin
953            Database.Params.Values['lc_ctype'] := param;
954            if Database.Connected then
# Line 1263 | Line 1263 | begin
1263      begin
1264        Database.Connected := true;
1265        Transaction.Active := true;
1266 <      FirebirdAPI.CharSetName2CharSetID(CharSet,aCharSetID);
1266 >      Database.Attachment.CharSetName2CharSetID(CharSet,aCharSetID);
1267        SetLength(Index,dim);
1268        ArrayIntf := Database.Attachment.CreateArray(
1269                       Transaction.TransactionIntf,
# Line 1706 | Line 1706 | begin
1706    end;
1707   end;
1708  
1709 < class function TIBXMLProcessor.FormatArray(ar: IArray): string;
1709 > class function TIBXMLProcessor.FormatArray(Database: TIBDatabase; ar: IArray
1710 >  ): string;
1711   var index: array of integer;
1712      TextOut: TStrings;
1713  
# Line 1751 | Line 1752 | begin
1752         s += Format(' scale = "%d"',[ ar.GetScale]);
1753      SQL_TEXT,
1754      SQL_VARYING:
1755 <      s += Format(' charset = "%s"',[FirebirdAPI.GetCharsetName(ar.GetCharSetID)]);
1755 >      s += Format(' charset = "%s"',[Database.Attachment.GetCharsetName(ar.GetCharSetID)]);
1756      end;
1757      bounds := ar.GetBounds;
1758      boundsList := '';

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines