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

Comparing ibx/trunk/design/ibmodifysqleditor.pas (file contents):
Revision 20 by tony, Mon Jul 7 13:00:15 2014 UTC vs.
Revision 21 by tony, Thu Feb 26 10:33:34 2015 UTC

# Line 32 | Line 32 | interface
32  
33   uses
34    Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
35 <  StdCtrls, IBSystemTables, IBDatabase, IBCustomDataSet;
35 >  StdCtrls, ComCtrls, IBSystemTables, IBDatabase, IBCustomDataSet;
36  
37   type
38  
# Line 41 | Line 41 | type
41    TIBModifySQLEditorForm = class(TForm)
42      Button1: TButton;
43      Button2: TButton;
44 +    FieldList: TListBox;
45      GenerateBtn: TButton;
46      GenerateParams: TCheckBox;
46 –    TestBtn: TButton;
47 –    IBTransaction1: TIBTransaction;
47      IncludePrimaryKeys: TCheckBox;
49 –    FieldList: TListBox;
48      Label1: TLabel;
49 +    Label16: TLabel;
50 +    Label17: TLabel;
51 +    Label18: TLabel;
52      Label2: TLabel;
52 –    Label3: TLabel;
53      Label4: TLabel;
54 +    ExecuteOnlyIndicator: TLabel;
55 +    PageControl: TPageControl;
56      PrimaryKeyList: TListBox;
57 +    ProcedureNames: TComboBox;
58 +    ProcInputList: TListBox;
59 +    ProcOutputList: TListBox;
60 +    TableNamesCombo: TComboBox;
61 +    ModifyPage: TTabSheet;
62 +    ExecutePage: TTabSheet;
63 +    TestBtn: TButton;
64 +    IBTransaction1: TIBTransaction;
65 +    Label3: TLabel;
66      QuoteFields: TCheckBox;
67      SQLText: TMemo;
68 <    TableNamesCombo: TComboBox;
68 >    procedure ExecutePageShow(Sender: TObject);
69      procedure GenerateBtnClick(Sender: TObject);
70 +    procedure ModifyPageShow(Sender: TObject);
71 +    procedure ProcedureNamesCloseUp(Sender: TObject);
72      procedure TestBtnClick(Sender: TObject);
73      procedure FieldListDblClick(Sender: TObject);
74      procedure FormShow(Sender: TObject);
# Line 78 | Line 91 | function EditSQL(DataSet: TIBCustomDataS
91  
92   implementation
93  
94 + uses IBSQL;
95 +
96   {$R *.lfm}
97  
98   function EditSQL(DataSet: TIBCustomDataSet; SelectSQL: TStrings): boolean;
# Line 113 | Line 128 | end;
128   { TIBModifySQLEditorForm }
129  
130   procedure TIBModifySQLEditorForm.FormShow(Sender: TObject);
131 < var TableName: string;
131 > var IsProcedureName: boolean;
132 >    SQLType: TIBSQLTypes;
133   begin
134    GenerateBtn.Enabled := (IBTransaction1.DefaultDatabase <> nil) and IBTransaction1.DefaultDatabase.Connected;
135    TestBtn.Enabled := (IBTransaction1.DefaultDatabase <> nil) and IBTransaction1.DefaultDatabase.Connected;
136 <  TableNamesCombo.Items.Clear;
121 <  try
122 <  FIBSystemTables.GetTableNames(TableNamesCombo.Items);
123 <  if TableNamesCombo.Items.Count > 0 then
136 >  if Trim(SQLText.Text) <> '' then
137    begin
138 <    TableNamesCombo.ItemIndex := 0;
139 <    if Trim(SQLText.Text) <> '' then
140 <    begin
141 <      FIBSystemTables.GetTableAndColumns(SQLText.Text,TableName,nil);
142 <      TableNamesCombo.ItemIndex := TableNamesCombo.Items.IndexOf(TableName)
143 <    end;
144 <    FIBSystemTables.GetFieldNames(TableNamesCombo.Text,FieldList.Items,IncludePrimaryKeys.checked,false);
145 <    FIBSystemTables.GetPrimaryKeys(TableNamesCombo.Text,PrimaryKeyList.Items);
146 <  end;
147 <  except {ignore}  end;
138 >    try
139 >      SQLType := FIBSystemTables.GetStatementType(SQLText.Text,IsProcedureName);
140 >    except  end;
141 >    if SQLType = SQLExecProcedure then
142 >      PageControl.ActivePage := ExecutePage
143 >    else
144 >      PageControl.ActivePage := ModifyPage;
145 >  end
146 >  else
147 >    PageControl.ActivePage := ModifyPage;
148   end;
149  
150   procedure TIBModifySQLEditorForm.PrimaryKeyListDblClick(Sender: TObject);
# Line 149 | Line 162 | end;
162   procedure TIBModifySQLEditorForm.GenerateBtnClick(Sender: TObject);
163   var FieldNames: TStrings;
164   begin
165 <  FieldNames :=  FIBSystemTables.GetFieldNames(FieldList);
166 <  try
167 <    FIBSystemTables.GenerateModifySQL(TableNamesCombo.Text,QuoteFields.Checked,
165 >  if PageControl.ActivePage = ExecutePage then
166 >    FIBSystemTables.GenerateExecuteSQL(ProcedureNames.Text,QuoteFields.Checked,true,
167 >          ProcInputList.Items,ProcOutputList.Items,SQLText.Lines)
168 >  else
169 >  begin
170 >    FieldNames :=  FIBSystemTables.GetFieldNames(FieldList);
171 >    try
172 >      FIBSystemTables.GenerateModifySQL(TableNamesCombo.Text,QuoteFields.Checked,
173               FieldNames,SQLText.Lines)
174 <  finally
175 <    FieldNames.Free
174 >    finally
175 >      FieldNames.Free
176 >    end;
177 >  end;
178 > end;
179 >
180 > procedure TIBModifySQLEditorForm.ExecutePageShow(Sender: TObject);
181 > var ProcName: string;
182 >    IsProcedureName: boolean;
183 > begin
184 >  FIBSystemTables.GetProcedureNames(ProcedureNames.Items,false);
185 >  if ProcedureNames.Items.Count > 0 then
186 >  begin
187 >    if (FIBSystemTables.GetStatementType(SQLText.Text,IsProcedureName) = SQLExecProcedure) or IsProcedureName then
188 >    begin
189 >      FIBSystemTables.GetTableAndColumns(SQLText.Text,ProcName,nil);
190 >      ProcedureNames.ItemIndex := ProcedureNames.Items.IndexOf(ProcName)
191 >    end
192 >    else
193 >      ProcedureNames.ItemIndex := 0;
194 >  end;
195 >  ProcedureNamesCloseUp(nil);
196 > end;
197 >
198 > procedure TIBModifySQLEditorForm.ModifyPageShow(Sender: TObject);
199 > var TableName: string;
200 > begin
201 >  TableNamesCombo.Items.Clear;
202 >  try
203 >  FIBSystemTables.GetTableNames(TableNamesCombo.Items);
204 >  if TableNamesCombo.Items.Count > 0 then
205 >  begin
206 >    TableNamesCombo.ItemIndex := 0;
207 >    if Trim(SQLText.Text) <> '' then
208 >    begin
209 >      FIBSystemTables.GetTableAndColumns(SQLText.Text,TableName,nil);
210 >      TableNamesCombo.ItemIndex := TableNamesCombo.Items.IndexOf(TableName)
211 >    end;
212 >    FIBSystemTables.GetFieldNames(TableNamesCombo.Text,FieldList.Items,IncludePrimaryKeys.checked,false);
213 >    FIBSystemTables.GetPrimaryKeys(TableNamesCombo.Text,PrimaryKeyList.Items);
214    end;
215 +  except {ignore}  end;
216 + end;
217 +
218 + procedure TIBModifySQLEditorForm.ProcedureNamesCloseUp(Sender: TObject);
219 + var ExecuteOnly: boolean;
220 + begin
221 +  FIBSystemTables.GetProcParams(ProcedureNames.Text,ExecuteOnly,ProcInputList.Items,ProcOutputList.Items);
222 +  ExecuteOnlyIndicator.Visible := ExecuteOnly;
223   end;
224  
225   procedure TIBModifySQLEditorForm.TestBtnClick(Sender: TObject);

Diff Legend

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