Skip to content

Improved support for InterBase 7.5.1 and SQL Dialect 1 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stevedrake wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improved support for InterBase 7.5.1 and SQL Dialect 1 #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77feada
Show ODS version and SQL dialect in database info
May 30, 2017
2c0458a
Set SQL dialect for connection according to SQL dialect of database
May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 33 additions & 15 deletions fbclone.cloner.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,17 +625,21 @@ function TCloner.Clone(const Source, Target: TDatabase): Boolean;
{$ENDIF}

AddLog('Source connection'
+ #13#10 + ' Database %s'
+ #13#10 + ' Username %s'
+ #13#10 + ' Page Size %d'
+ #13#10 + ' Client %s'
+ #13#10 + ' Database %s'
+ #13#10 + ' Username %s'
+ #13#10 + ' Page Size %d'
+ #13#10 + ' ODS version %d.%d'
+ #13#10 + ' SQL dialect %d'
+ #13#10 + ' Client %s'
{$IFDEF FB102_UP}
+ #13#10 + ' Server %s'
+ #13#10 + ' Server %s'
{$ENDIF},
[
Source.ConnectionString,
Source.Username,
SrcDatabase.InfoPageSize,
SrcDatabase.InfoOdsVersion, SrcDatabase.InfoOdsMinorVersion,
SrcDatabase.InfoDbSqlDialect,
SrcDatabase.InfoVersion
{$IFDEF FB102_UP}
,SrcDatabase.InfoFirebirdVersion
Expand Down Expand Up @@ -667,17 +671,21 @@ function TCloner.Clone(const Source, Target: TDatabase): Boolean;
if coPumpOnly in FOptions then
begin
AddLog(#13#10 + 'Target connection'
+ #13#10 + ' Database %s'
+ #13#10 + ' Username %s'
+ #13#10 + ' Page Size %d'
+ #13#10 + ' Client %s'
+ #13#10 + ' Database %s'
+ #13#10 + ' Username %s'
+ #13#10 + ' Page Size %d'
+ #13#10 + ' ODS version %d.%d'
+ #13#10 + ' SQL dialect %d'
+ #13#10 + ' Client %s'
{$IFDEF FB102_UP}
+ #13#10 + ' Server %s'
+ #13#10 + ' Server %s'
{$ENDIF},
[
Target.ConnectionString,
Target.Username,
DstDatabase.InfoPageSize,
DstDatabase.InfoOdsVersion, DstDatabase.InfoOdsMinorVersion,
DstDatabase.InfoDbSqlDialect,
DstDatabase.InfoVersion
{$IFDEF FB102_UP}
,DstDatabase.InfoFirebirdVersion
Expand Down Expand Up @@ -711,6 +719,12 @@ function TCloner.Clone(const Source, Target: TDatabase): Boolean;
{$ENDIF}
end;

SrcDatabase.SQLDialect := SrcDatabase.InfoDbSqlDialect;
if coPumpOnly in FOptions then
DstDatabase.SQLDialect := DstDatabase.InfoDbSqlDialect
else
DstDatabase.SQLDialect := SrcDatabase.SQLDialect;

metasrc := TMetaDataBase.Create(nil,-1);
metatgt := TMetaDataBase.Create(nil,-1);

Expand Down Expand Up @@ -786,17 +800,21 @@ function TCloner.Clone(const Source, Target: TDatabase): Boolean;
{$ENDIF}

AddLog(#13#10 + 'Create Target'
+ #13#10 + ' Database %s'
+ #13#10 + ' Username %s'
+ #13#10 + ' Page Size %d'
+ #13#10 + ' Client %s'
+ #13#10 + ' Database %s'
+ #13#10 + ' Username %s'
+ #13#10 + ' Page Size %d'
+ #13#10 + ' ODS version %d.%d'
+ #13#10 + ' SQL dialect %d'
+ #13#10 + ' Client %s'
{$IFDEF FB102_UP}
+ #13#10 + ' Server %s'
+ #13#10 + ' Server %s'
{$ENDIF},
[
Target.ConnectionString,
Target.Username,
DstDatabase.InfoPageSize,
DstDatabase.InfoOdsVersion, DstDatabase.InfoOdsMinorVersion,
DstDatabase.InfoDbSqlDialect,
DstDatabase.InfoVersion
{$IFDEF FB102_UP}
,DstDatabase.InfoFirebirdVersion
Expand Down