mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-06 21:18:01 +02:00
* Added code creation from table definition, and allow saving a connection when doing an import
git-svn-id: trunk@15921 -
This commit is contained in:
michael
parent
2c4f79d8ce
commit
c255b0acb7
@ -72,6 +72,8 @@ Type
|
||||
procedure Notification(AComponent: TComponent; Operation: TOperation); override;
|
||||
Procedure Connect(Connectstring : String);
|
||||
Procedure DisConnect;
|
||||
Function CanCreateCode : Boolean;
|
||||
Procedure CreateCode;
|
||||
Property Engine : TFPDDEngine Read FEngine Write SetEngine;
|
||||
Property ObjectType : TObjectType Read GetCurrentObjectType;
|
||||
Property Description : String Read FDescription Write SetDescription;
|
||||
@ -239,6 +241,44 @@ begin
|
||||
FEngine.Disconnect;
|
||||
end;
|
||||
|
||||
function TConnectionEditor.CanCreateCode: Boolean;
|
||||
|
||||
Var
|
||||
C : TControl;
|
||||
|
||||
begin
|
||||
Result:=False;
|
||||
If FPC.ActivePage=FTSQuery then
|
||||
begin
|
||||
Result:=Assigned(FQueryPanel.Dataset) and FQueryPanel.Dataset.Active;
|
||||
end
|
||||
else If FPC.ActivePage=FTSDisplay then
|
||||
begin
|
||||
C:=FDisplay.Controls[0];
|
||||
If Not (C is TDataPanel) then
|
||||
C:=Nil;
|
||||
Result:=Assigned(C);
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TConnectionEditor.CreateCode;
|
||||
|
||||
Var
|
||||
C : TControl;
|
||||
|
||||
begin
|
||||
If FPC.ActivePage=FTSQuery then
|
||||
begin
|
||||
FQueryPanel.CreateCode;
|
||||
end
|
||||
else If FPC.ActivePage=FTSDisplay then
|
||||
begin
|
||||
C:=FDisplay.Controls[0];
|
||||
If (C is TDataPanel) then
|
||||
TDataPanel(C).CreateCode;
|
||||
end;
|
||||
end;
|
||||
|
||||
function TConnectionEditor.NewNode(TV : TTreeView;ParentNode: TTreeNode; ACaption: String; AImageIndex : Integer
|
||||
): TTreeNode;
|
||||
begin
|
||||
|
||||
@ -81,6 +81,7 @@ Type
|
||||
Procedure DeleteTable(TD : TDDTableDef);
|
||||
Procedure DeleteField(FD : TDDFieldDef);
|
||||
Procedure DeleteIndex(ID : TDDIndexDef);
|
||||
Procedure CreateCode;
|
||||
Property DataDictionary : TFPDataDictionary Read FDD;
|
||||
Property Modified : Boolean Read FModified Write SetModified;
|
||||
Property ImageOffset : Integer Read FImageOffset Write FImageOffset;
|
||||
@ -106,7 +107,7 @@ Const
|
||||
|
||||
implementation
|
||||
|
||||
uses Dialogs;
|
||||
uses DB, MemDS, Dialogs, fpcodegenerator;
|
||||
|
||||
ResourceString
|
||||
SNodeDataDictionary = 'Datadictionary';
|
||||
@ -115,6 +116,34 @@ ResourceString
|
||||
SNewDictionary = 'New dictionary';
|
||||
SNodeIndexes = 'Indexes';
|
||||
|
||||
Function CreateDatasetFromTabledef(TD : TDDTableDef;AOwner : TComponent = Nil) : TDataset;
|
||||
|
||||
Var
|
||||
MDS : TMemDataset;
|
||||
I : Integer;
|
||||
FD : TFieldDef;
|
||||
FDD : TDDFieldDef;
|
||||
|
||||
begin
|
||||
MDS:=TMemDataset.Create(AOwner);
|
||||
try
|
||||
For I:=0 to TD.Fields.Count-1 do
|
||||
begin
|
||||
FDD:=TD.Fields[i];
|
||||
MDS.FieldDefs.Add(FDD.FieldName,FDD.FieldType);
|
||||
end;
|
||||
MDS.CreateTable;
|
||||
MDS.Open;
|
||||
except
|
||||
MDS.Free;
|
||||
Raise;
|
||||
end;
|
||||
Result:=MDS;
|
||||
end;
|
||||
|
||||
|
||||
|
||||
|
||||
{ TDataDictEditor }
|
||||
|
||||
function TDataDictEditor.NewNode(TV : TTreeView;ParentNode: TTreeNode; ACaption: String; AImageIndex : Integer
|
||||
@ -720,6 +749,30 @@ begin
|
||||
Modified:=True;
|
||||
end;
|
||||
|
||||
procedure TDataDictEditor.CreateCode;
|
||||
|
||||
Var
|
||||
TD : TDDTableDef;
|
||||
DS : TDataset;
|
||||
|
||||
begin
|
||||
TD:=CurrentTable;
|
||||
If Not assigned(TD) then
|
||||
exit;
|
||||
DS:=CreateDatasetFromTabledef(TD,Self);
|
||||
try
|
||||
With TFPCodeGenerator.Create(DS) do
|
||||
try
|
||||
DataSet:=DS;
|
||||
Execute;
|
||||
Finally
|
||||
Free;
|
||||
end;
|
||||
finally
|
||||
DS.Free;
|
||||
end;
|
||||
end;
|
||||
|
||||
initialization
|
||||
{$i dicteditor.lrs}
|
||||
end.
|
||||
|
||||
@ -5,7 +5,7 @@ object MainForm: TMainForm
|
||||
Width = 487
|
||||
ActiveControl = LVConnections
|
||||
Caption = 'Lazarus Data Dictionary'
|
||||
ClientHeight = 347
|
||||
ClientHeight = 348
|
||||
ClientWidth = 487
|
||||
Menu = MainMenu1
|
||||
OnClose = FormClose
|
||||
@ -115,9 +115,15 @@ object MainForm: TMainForm
|
||||
Top = 2
|
||||
Action = ADeleteIndex
|
||||
end
|
||||
object ToolButton5: TToolButton
|
||||
Left = 304
|
||||
Hint = 'Create code from definition or data'
|
||||
Top = 2
|
||||
Action = ACreateCode
|
||||
end
|
||||
end
|
||||
object PCDD: TPageControl
|
||||
Height = 301
|
||||
Height = 302
|
||||
Top = 26
|
||||
Width = 487
|
||||
ActivePage = TSConnections
|
||||
@ -126,10 +132,10 @@ object MainForm: TMainForm
|
||||
TabOrder = 1
|
||||
object TSRecent: TTabSheet
|
||||
Caption = 'Dictionaries'
|
||||
ClientHeight = 301
|
||||
ClientHeight = 302
|
||||
ClientWidth = 487
|
||||
object LVDicts: TListView
|
||||
Height = 301
|
||||
Height = 302
|
||||
Width = 487
|
||||
Align = alClient
|
||||
Columns = <
|
||||
@ -155,10 +161,10 @@ object MainForm: TMainForm
|
||||
end
|
||||
object TSConnections: TTabSheet
|
||||
Caption = 'Connections'
|
||||
ClientHeight = 270
|
||||
ClientHeight = 272
|
||||
ClientWidth = 483
|
||||
object LVConnections: TListView
|
||||
Height = 270
|
||||
Height = 272
|
||||
Width = 483
|
||||
Align = alClient
|
||||
Columns = <
|
||||
@ -189,7 +195,7 @@ object MainForm: TMainForm
|
||||
end
|
||||
object PStatus: TPanel
|
||||
Height = 20
|
||||
Top = 327
|
||||
Top = 328
|
||||
Width = 487
|
||||
Align = alBottom
|
||||
BevelOuter = bvNone
|
||||
@ -770,12 +776,21 @@ object MainForm: TMainForm
|
||||
OnExecute = ADeleteIndexExecute
|
||||
OnUpdate = ADeleteIndexUpdate
|
||||
end
|
||||
object ACreateCode: TAction
|
||||
Category = 'Dictionary'
|
||||
Caption = 'Create code'
|
||||
DisableIfNoHandler = True
|
||||
Hint = 'Create code from definition or data'
|
||||
ImageIndex = 10
|
||||
OnExecute = ACreateCodeExecute
|
||||
OnUpdate = ACreateCodeUpdate
|
||||
end
|
||||
end
|
||||
object ILMain: TImageList
|
||||
left = 47
|
||||
top = 123
|
||||
Bitmap = {
|
||||
4C690A0000001000000010000000000000000000000000000000000000000000
|
||||
4C690B0000001000000010000000000000000000000000000000000000000000
|
||||
000000000000000000FF000000FF000000FF000000FF00000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000FF000000FF00000000000000FF000000FF000000FF000000FF0000
|
||||
@ -1095,7 +1110,39 @@ object MainForm: TMainForm
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
00000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF00000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000FFFF0000FFFF
|
||||
0000000000000000FFFF0000FFFF00000000000000FF000000FF000000FF0000
|
||||
00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
|
||||
00FF000000FF000000000000000000000000BFBFBFFFF5F5F5FFF5F5F5FFF6F6
|
||||
F6FFF6F6F6FFF6F6F6FFF6F6F6FFF7F7F7FFF7F7F7FFF8F8F8FFF8F8F8FFF9F9
|
||||
F9FFF9F9F9FFB9B9B9FF00000000000000FFF5F5F5FFE1E1E1FFE2E2E2FFE3E3
|
||||
E3FFE4E4E4FFE5E5E5FFE7E7E7FFE8E8E8FFE9E9E9FFEAEAEAFFEBEBEBFFEDED
|
||||
EDFFEEEEEEFFEFEFEFFF000000FF000000FFF5F5F5FFE2E2E2FF6D6D6DFF6D6D
|
||||
6DFF6E6E6EFF6F6F6FFF6F6F6FFF707070FFEAEAEAFFEBEBEBFFEDEDEDFFEEEE
|
||||
EEFFEFEFEFFFF0F0F0FF000000FF000000FFF6F6F6FFE3E3E3FFE4E4E4FFE5E5
|
||||
E5FFE7E7E7FFE8E8E8FFE9E9E9FFEAEAEAFFEBEBEBFFEDEDEDFFEEEEEEFFEFEF
|
||||
EFFFF0F0F0FFF1F1F1FF000000FF000000FFF6F6F6FFE4E4E4FF6E6E6EFF6F6F
|
||||
6FFF6F6F6FFF707070FF707070FFEBEBEBFFEDEDEDFFEEEEEEFFEFEFEFFFF0F0
|
||||
F0FFF1F1F1FFF3F3F3FF000000FF000000FFF6F6F6FFE5E5E5FFE7E7E7FFE8E8
|
||||
E8FFE9E9E9FFEAEAEAFFEBEBEBFFEDEDEDFFEEEEEEFFEFEFEFFFF0F0F0FFF1F1
|
||||
F1FFF3F3F3FFF4F4F4FF000000FF000000FFF6F6F6FFE7E7E7FF6F6F6FFF7070
|
||||
70FF707070FF717171FF727272FF727272FF737373FF737373FFF1F1F1FFF3F3
|
||||
F3FFF4F4F4FFF5F5F5FF000000FF000000FFF7F7F7FFE8E8E8FFE9E9E9FFEAEA
|
||||
EAFFEBEBEBFFEDEDEDFFEEEEEEFFEFEFEFFFF0F0F0FFF1F1F1FFF3F3F3FFF4F4
|
||||
F4FFF5F5F5FFF6F6F6FF000000FF000000FFF7F7F7FFE9E9E9FF707070FF7171
|
||||
71FF727272FF727272FFEFEFEFFFF0F0F0FFF1F1F1FFF3F3F3FFF4F4F4FFF5F5
|
||||
F5FFF6F6F6FFF7F7F7FF000000FF000000FFF8F8F8FFEAEAEAFFEBEBEBFFEDED
|
||||
EDFFEEEEEEFFEFEFEFFFF0F0F0FFF1F1F1FFF3F3F3FFF4F4F4FFF5F5F5FFF6F6
|
||||
F6FFF7F7F7FFF9F9F9FF000000FF000000FFF9F9F9FFEDEDEDFF727272FF7373
|
||||
73FF737373FF747474FF757575FF757575FFF5F5F5FFF6F6F6FFF7F7F7FFF9F9
|
||||
F9FFFAFAFAFFFBFBFBFF000000FF000000FFF9F9F9FFEEEEEEFFEFEFEFFFF0F0
|
||||
F0FFF1F1F1FFF3F3F3FFF4F4F4FFF5F5F5FFF6F6F6FFF7F7F7FFF9F9F9FFFAFA
|
||||
FAFFFBFBFBFFFCFCFCFF000000FF000000FFBEBEBEFFEFEFEFFFF0F0F0FFF1F1
|
||||
F1FFF3F3F3FFF4F4F4FFF5F5F5FFF6F6F6FFF7F7F7FFF9F9F9FFFAFAFAFFFBFB
|
||||
FBFFFCFCFCFFC1C1C1FF000000000000000000000000000000FF000000FF0000
|
||||
00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
|
||||
00FF000000FF0000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000
|
||||
}
|
||||
end
|
||||
object ODDD: TOpenDialog
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -50,6 +50,7 @@ type
|
||||
AClose: TAction;
|
||||
ACloseAll: TAction;
|
||||
ACopyConnection: TAction;
|
||||
ACreateCode: TAction;
|
||||
ANewIndex: TAction;
|
||||
ADeleteIndex: TAction;
|
||||
ADeleteConnection: TAction;
|
||||
@ -108,6 +109,8 @@ type
|
||||
ToolButton4: TToolButton;
|
||||
TBAddIndex: TToolButton;
|
||||
TBDeleteIndex: TToolButton;
|
||||
TBCreateCode: TToolButton;
|
||||
ToolButton5: TToolButton;
|
||||
TSConnections: TTabSheet;
|
||||
ToolButton1: TToolButton;
|
||||
TBNewTable: TToolButton;
|
||||
@ -124,6 +127,8 @@ type
|
||||
TBNew: TToolButton;
|
||||
procedure ACloseAllExecute(Sender: TObject);
|
||||
procedure ACloseExecute(Sender: TObject);
|
||||
procedure ACreateCodeExecute(Sender: TObject);
|
||||
procedure ACreateCodeUpdate(Sender: TObject);
|
||||
procedure ADeleteFieldExecute(Sender: TObject);
|
||||
procedure ADeleteFieldUpdate(Sender: TObject);
|
||||
procedure ADeleteIndexExecute(Sender: TObject);
|
||||
@ -262,6 +267,7 @@ ResourceString
|
||||
'Would you like to override the connection data ?';
|
||||
SUnknownDictionary = 'Unknown data dictionary: %s';
|
||||
SUnknownConnection = 'Unknown connection: %s';
|
||||
SCreateConnection = 'Would you like to create a new connection for this database ?';
|
||||
|
||||
|
||||
{ ---------------------------------------------------------------------
|
||||
@ -698,6 +704,37 @@ begin
|
||||
CloseCurrentTab;
|
||||
end;
|
||||
|
||||
procedure TMainForm.ACreateCodeExecute(Sender: TObject);
|
||||
begin
|
||||
If Assigned(CurrentEditor) then
|
||||
begin
|
||||
If Assigned(CurrentEditor.CurrentTable) then
|
||||
CurrentEditor.CreateCode
|
||||
end
|
||||
else if Assigned(CurrentConnection) then
|
||||
begin
|
||||
CurrentConnection.CreateCode;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TMainForm.ACreateCodeUpdate(Sender: TObject);
|
||||
|
||||
Var
|
||||
B : Boolean;
|
||||
|
||||
begin
|
||||
B:=Assigned(CurrentEditor);
|
||||
If B then
|
||||
B:=Assigned(CurrentEditor.CurrentTable)
|
||||
else
|
||||
begin
|
||||
B:=Assigned(CurrentConnection);
|
||||
If B then
|
||||
B:=CurrentConnection.CanCreateCode;
|
||||
end;
|
||||
(Sender as TAction).Enabled:=B;
|
||||
end;
|
||||
|
||||
procedure TMainForm.ADeleteFieldExecute(Sender: TObject);
|
||||
begin
|
||||
DeleteCurrentField;
|
||||
@ -1130,7 +1167,7 @@ procedure TMainForm.DoImport(Const EngineName, Connectionstring : String);
|
||||
Var
|
||||
DDE : TFPDDengine;
|
||||
CDE : TDatadictEditor;
|
||||
CS : String;
|
||||
CS,CN : String;
|
||||
L : TStringList;
|
||||
B : Boolean;
|
||||
|
||||
@ -1139,7 +1176,12 @@ begin
|
||||
Try
|
||||
CS:=ConnectionString;
|
||||
If (CS='') then
|
||||
begin
|
||||
CS:=DDE.GetConnectString;
|
||||
If (CS<>'') then
|
||||
if MessageDLg(SCreateConnection,mtConfirmation,[mbYes,mbNo],0)=mrYes then
|
||||
GetConnectionName(CN);
|
||||
end;
|
||||
If (CS='') then
|
||||
exit;
|
||||
DDE.Connect(CS);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user