Do not restore previous state of checkbox options "Drop database" and "Drop tables", leave them off when calling the export sql dialog. Fixes issue #3197.

This commit is contained in:
Ansgar Becker
2013-05-25 05:45:25 +00:00
parent 62da5d8833
commit 3569ee8d94
2 changed files with 2 additions and 8 deletions

View File

@@ -148,8 +148,8 @@ type
asPlinkExecutable, asSSHtunnelHost, asSSHtunnelHostPort, asSSHtunnelPort, asSSHtunnelUser,
asSSHtunnelPassword, asSSHtunnelTimeout, asSSHtunnelPrivateKey, asSSLActive, asSSLKey,
asSSLCert, asSSLCA, asNetType, asCompressed, asLocalTimeZone,
asStartupScriptFilename, asDatabases, asDatabaseFilter, asTableFilter, asExportSQLCreateDatabases, asExportSQLDropDatabases,
asExportSQLCreateTables, asExportSQLDropTables, asExportSQLDataHow, asExportSQLFilenames, asExportSQLDirectories,
asStartupScriptFilename, asDatabases, asDatabaseFilter, asTableFilter, asExportSQLCreateDatabases,
asExportSQLCreateTables, asExportSQLDataHow, asExportSQLFilenames, asExportSQLDirectories,
asExportSQLDatabase, asExportSQLServerDatabase, asExportSQLOutput, asGridExportOutputCopy, asGridExportOutputFile,
asGridExportFilename, asGridExportRecentFiles, asGridExportEncoding, asGridExportFormat, asGridExportSelection,
asGridExportColumnNames, asGridExportIncludeAutoInc, asGridExportIncludeQuery,
@@ -3147,9 +3147,7 @@ begin
InitSetting(asDatabaseFilter, 'DatabaseFilter', 0, False, '');
InitSetting(asTableFilter, 'TableFilter', 0, False, '');
InitSetting(asExportSQLCreateDatabases, 'ExportSQL_CreateDatabases', 0, False);
InitSetting(asExportSQLDropDatabases, 'ExportSQL_DropDatabases', 0, False);
InitSetting(asExportSQLCreateTables, 'ExportSQL_CreateTables', 0, False);
InitSetting(asExportSQLDropTables, 'ExportSQL_DropTables', 0, False);
InitSetting(asExportSQLDataHow, 'ExportSQL_DataHow', 0);
InitSetting(asExportSQLFilenames, 'ExportSQL_Filenames', 0, False, '');
InitSetting(asExportSQLDirectories, 'ExportSQL_Directories', 0, False, '');

View File

@@ -198,9 +198,7 @@ begin
// SQL export tab
chkExportDatabasesCreate.Checked := AppSettings.ReadBool(asExportSQLCreateDatabases);
chkExportDatabasesDrop.Checked := AppSettings.ReadBool(asExportSQLDropDatabases);
chkExportTablesCreate.Checked := AppSettings.ReadBool(asExportSQLCreateTables);
chkExportTablesDrop.Checked := AppSettings.ReadBool(asExportSQLDropTables);
comboExportData.Items.Text := DATA_NO+CRLF +DATA_REPLACE+CRLF +DATA_INSERT+CRLF +DATA_INSERTNEW+CRLF +DATA_UPDATE;
comboExportData.ItemIndex := AppSettings.ReadInt(asExportSQLDataHow);
// Add hardcoded output options and session names from registry
@@ -336,9 +334,7 @@ begin
tmSQLExport: begin
AppSettings.WriteBool(asExportSQLCreateDatabases, chkExportDatabasesCreate.Checked);
AppSettings.WriteBool(asExportSQLDropDatabases, chkExportDatabasesDrop.Checked);
AppSettings.WriteBool(asExportSQLCreateTables, chkExportTablesCreate.Checked);
AppSettings.WriteBool(asExportSQLDropTables, chkExportTablesDrop.Checked);
AppSettings.WriteInt(asExportSQLDataHow, comboExportData.ItemIndex);
AppSettings.WriteInt(asExportSQLOutput, comboExportOutputType.ItemIndex);