| 476 |
|
implementation |
| 477 |
|
|
| 478 |
|
uses IBSQLMonitor, IBCustomDataSet, IBDatabaseInfo, IBSQL, IBUtils, |
| 479 |
< |
typInfo, FBMessages, IBErrorCodes; |
| 479 |
> |
typInfo, FBMessages, IBErrorCodes, RegExpr; |
| 480 |
|
|
| 481 |
|
{ TIBDatabase } |
| 482 |
|
|
| 611 |
|
end; |
| 612 |
|
|
| 613 |
|
procedure TIBDataBase.CreateDatabase(createDatabaseSQL: string); |
| 614 |
< |
var info: IDBInformation; |
| 615 |
< |
ConnectionType: integer; |
| 616 |
< |
SiteName: string; |
| 614 |
> |
var RegexObj: TRegExpr; |
| 615 |
|
begin |
| 616 |
|
CheckInactive; |
| 617 |
|
FAttachment := FirebirdAPI.CreateDatabase(createDatabaseSQL,FSQLDialect); |
| 618 |
< |
info := FAttachment.GetDBInformation(isc_info_db_id); |
| 619 |
< |
info[0].DecodeIDCluster(ConnectionType,FDBName,SiteName); |
| 618 |
> |
RegexObj := TRegExpr.Create; |
| 619 |
> |
try |
| 620 |
> |
{extact database file spec} |
| 621 |
> |
RegexObj.ModifierG := false; {turn off greedy matches} |
| 622 |
> |
RegexObj.Expression := '^ *CREATE +(DATABASE|SCHEMA) +''(.*)'''; |
| 623 |
> |
if RegexObj.Exec(AnsiUpperCase(createDatabaseSQL)) then |
| 624 |
> |
FDBName := system.copy(createDatabaseSQL,RegexObj.MatchPos[2],RegexObj.MatchLen[2]); |
| 625 |
> |
finally |
| 626 |
> |
RegexObj.Free; |
| 627 |
> |
end; |
| 628 |
|
if assigned(FOnCreateDatabase) and (FAttachment <> nil) then |
| 629 |
|
OnCreateDatabase(self); |
| 630 |
|
end; |
| 959 |
|
if UseDefaultSystemCodePage then |
| 960 |
|
begin |
| 961 |
|
{$ifdef WINDOWS} |
| 962 |
< |
if FirebirdAPI.CodePage2CharSetID(GetACP,CharSetID) then |
| 963 |
< |
TempDBParams.Values['lc_ctype'] := FirebirdAPI.GetCharsetName(CharSetID) |
| 962 |
> |
if Attachment.CodePage2CharSetID(GetACP,CharSetID) then |
| 963 |
> |
TempDBParams.Values['lc_ctype'] := Attachment.GetCharsetName(CharSetID) |
| 964 |
|
{$else} |
| 965 |
< |
if FirebirdAPI.CodePage2CharSetID(DefaultSystemCodePage,CharSetID) then |
| 966 |
< |
TempDBParams.Values['lc_ctype'] := FirebirdAPI.GetCharsetName(CharSetID) |
| 965 |
> |
if Attachment.CodePage2CharSetID(DefaultSystemCodePage,CharSetID) then |
| 966 |
> |
TempDBParams.Values['lc_ctype'] := Attachment.GetCharsetName(CharSetID) |
| 967 |
|
{$endif} |
| 968 |
|
else |
| 969 |
|
TempDBParams.Values['lc_ctype'] :='UTF8'; |
| 976 |
|
end; |
| 977 |
|
|
| 978 |
|
FDefaultCharSetName := AnsiUpperCase(TempDBParams.Values['lc_ctype']); |
| 973 |
– |
if FDefaultCharSetName <> '' then |
| 974 |
– |
FirebirdAPI.CharSetName2CharSetID(FDefaultCharSetName,FDefaultCharSetID); |
| 975 |
– |
FirebirdAPI.CharSetID2CodePage(FDefaultCharSetID,FDefaultCodePage); |
| 979 |
|
{ Generate a new DPB if necessary } |
| 980 |
|
if (FDBParamsChanged or (TempDBParams.Text <> FDBParams.Text)) then |
| 981 |
|
begin |
| 1029 |
|
raise EIBInterBaseError.Create(Status); |
| 1030 |
|
end; |
| 1031 |
|
until FAttachment <> nil; |
| 1032 |
+ |
|
| 1033 |
+ |
if FDefaultCharSetName <> '' then |
| 1034 |
+ |
Attachment.CharSetName2CharSetID(FDefaultCharSetName,FDefaultCharSetID); |
| 1035 |
+ |
Attachment.CharSetID2CodePage(FDefaultCharSetID,FDefaultCodePage); |
| 1036 |
+ |
|
| 1037 |
|
if not (csDesigning in ComponentState) then |
| 1038 |
|
FDBName := aDBName; {Synchronise at run time} |
| 1039 |
|
FDBSQLDialect := GetDBSQLDialect; |
