Browse Source

Cleanup

pull/18/head
PeterForstmeier 14 years ago
parent
commit
620f473b2a
  1. 16
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml.cs
  2. 2
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/SQLServerDatabaseDriver.cs

16
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Windows/ConnectionWizardWindow.xaml.cs

@ -115,22 +115,17 @@ namespace ICSharpCode.Data.Core.UI.Windows
{ {
Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() => { IsLoading = value; })); Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() => { IsLoading = value; }));
} }
// private void SetException(Exception exception)
// {
// Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() => { DatasourceException = exception; }));
// }
private void SetException(Exception exception) private void SetException(Exception exception)
{ {
if (exception!= null) { if (exception!= null) {
Dispatcher.BeginInvoke(DispatcherPriority.Background,
new Action(() => {MessageService.ShowError(exception.Message);}));
Dispatcher.BeginInvoke(DispatcherPriority.Background,
new Action(() => {MessageService.ShowError(exception.Message);}));
} }
} }
private void SetSelectedDatasource(IDatasource datasource) private void SetSelectedDatasource(IDatasource datasource)
{ {
Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() => { SelectedDatasource = datasource; })); Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() => { SelectedDatasource = datasource; }));
@ -174,7 +169,6 @@ namespace ICSharpCode.Data.Core.UI.Windows
try try
{ {
// SelectedDatabaseDriver.PopulateDatabases();
SelectedDatabaseDriver.PopulateDatabases(_selectedDatasource); SelectedDatabaseDriver.PopulateDatabases(_selectedDatasource);
} }
catch (Exception ex) catch (Exception ex)

2
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/SQLServerDatabaseDriver.cs

@ -30,7 +30,7 @@ namespace ICSharpCode.Data.Core.DatabaseDrivers.SQLServer
private const string _getTables = @"SELECT TABLE_SCHEMA, TABLE_NAME from INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE='BASE TABLE' AND TABLE_NAME<>'dtproperties' ORDER BY TABLE_SCHEMA, TABLE_NAME"; private const string _getTables = @"SELECT TABLE_SCHEMA, TABLE_NAME from INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE='BASE TABLE' AND TABLE_NAME<>'dtproperties' ORDER BY TABLE_SCHEMA, TABLE_NAME";
//http://community.sharpdevelop.net/forums/p/12955/37213.aspx#37213 //http://community.sharpdevelop.net/forums/p/12955/37213.aspx#37213
//clmns.is_column_set AS [IsColumnSet], //remove this line clmns.is_column_set AS [IsColumnSet],
private const string _getColumnsScript = @"DECLARE @tablename varchar(100) SET @tablename = N'{0}' private const string _getColumnsScript = @"DECLARE @tablename varchar(100) SET @tablename = N'{0}'
SELECT SELECT

Loading…
Cancel
Save