From ad041035f945da2d21a1e0cc92a0ff55be1fb663 Mon Sep 17 00:00:00 2001 From: "Valeriano A.R" Date: Fri, 27 Jan 2017 11:20:39 +0100 Subject: [PATCH] Refactorings --- ServerExplorer/Code/DataAccess/DatabaseDA.cs | 14 ++- ServerExplorer/Code/DataAccess/ServerDA.cs | 6 +- ServerExplorer/Code/DataAccess/TableDA.cs | 31 ++++- ServerExplorer/Code/DataTransfer/Column.cs | 2 +- ServerExplorer/Code/DataTransfer/Database.cs | 2 +- ServerExplorer/Code/DataTransfer/Server.cs | 2 +- ServerExplorer/Code/DataTransfer/Table.cs | 5 +- ServerExplorer/Code/DataTransfer/User.cs | 2 +- ServerExplorer/Controls/CustomTextBox.cs | 2 +- ServerExplorer/Controls/WindowButton.cs | 18 +-- .../Properties/Resources.Designer.cs | 63 ---------- ServerExplorer/Properties/Resources.resx | 117 ------------------ .../Properties/Settings.Designer.cs | 26 ---- ServerExplorer/Properties/Settings.settings | 7 -- ServerExplorer/ServerExplorer.csproj | 19 --- ServerExplorer/UI/FrmBaseDatos.Designer.cs | 55 ++++---- ServerExplorer/UI/FrmBaseDatos.cs | 35 +++--- 17 files changed, 101 insertions(+), 305 deletions(-) delete mode 100644 ServerExplorer/Properties/Resources.Designer.cs delete mode 100644 ServerExplorer/Properties/Resources.resx delete mode 100644 ServerExplorer/Properties/Settings.Designer.cs delete mode 100644 ServerExplorer/Properties/Settings.settings diff --git a/ServerExplorer/Code/DataAccess/DatabaseDA.cs b/ServerExplorer/Code/DataAccess/DatabaseDA.cs index edf2dc3..a1283a5 100644 --- a/ServerExplorer/Code/DataAccess/DatabaseDA.cs +++ b/ServerExplorer/Code/DataAccess/DatabaseDA.cs @@ -6,22 +6,26 @@ using ServerExplorer.Code.DataTransfer; namespace ServerExplorer.Code.DataAccess { - class DatabaseDA + public class DatabaseDA { public static List Database_GetRegs(string conexionString) { var databases = new List(); var cnx = new SqlConnection(conexionString); + cnx.Open(); DataTable dt = cnx.GetSchema("Databases"); cnx.Close(); + dt.DefaultView.Sort = "database_name ASC, create_date ASC"; + dt = dt.DefaultView.ToTable(); + foreach (DataRow dr in dt.Rows) { databases.Add(new Database - { - Name = (String) dr["database_name"], - CreateDate = (DateTime) dr["create_date"] - }); + { + Name = (String) dr["database_name"], + CreateDate = (DateTime) dr["create_date"] + }); } return databases; } diff --git a/ServerExplorer/Code/DataAccess/ServerDA.cs b/ServerExplorer/Code/DataAccess/ServerDA.cs index 6072488..7b0e0c3 100644 --- a/ServerExplorer/Code/DataAccess/ServerDA.cs +++ b/ServerExplorer/Code/DataAccess/ServerDA.cs @@ -6,13 +6,17 @@ using ServerExplorer.Code.DataTransfer; namespace ServerExplorer.Code.DataAccess { - class ServerDA + public class ServerDA { public static List Server_GetRegs() { var servers = new List(); SqlDataSourceEnumerator enumerador = SqlDataSourceEnumerator.Instance; + DataTable dtServers = enumerador.GetDataSources(); + dtServers.DefaultView.Sort = "ServerName ASC, InstanceName ASC, Version ASC"; + dtServers = dtServers.DefaultView.ToTable(); + foreach (DataRow dr in dtServers.Rows) { servers.Add(new Server diff --git a/ServerExplorer/Code/DataAccess/TableDA.cs b/ServerExplorer/Code/DataAccess/TableDA.cs index 4ffb24b..e832545 100644 --- a/ServerExplorer/Code/DataAccess/TableDA.cs +++ b/ServerExplorer/Code/DataAccess/TableDA.cs @@ -1,11 +1,36 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Data; +using System.Data.SqlClient; +using ServerExplorer.Code.DataTransfer; namespace ServerExplorer.Code.DataAccess { - class TableDA + public class TableDA { + public static List Table_GetRegs(string conexionString) + { + var tables = new List
(); + var cnx = new SqlConnection(conexionString); + + cnx.Open(); + DataTable dt = cnx.GetSchema("Tables"); + cnx.Close(); + dt.DefaultView.Sort = "TABLE_SCHEMA ASC, TABLE_NAME ASC, TABLE_TYPE ASC"; + dt = dt.DefaultView.ToTable(); + + // Mostrar todas las tablas + foreach (DataRow dr in dt.Rows) + { + tables.Add(new Table + { + Schema = (string)dr["TABLE_SCHEMA"], + Name = (string)dr["TABLE_NAME"], + Type = (string)dr["TABLE_TYPE"] + }); + } + + return tables; + } } } diff --git a/ServerExplorer/Code/DataTransfer/Column.cs b/ServerExplorer/Code/DataTransfer/Column.cs index 5fa6424..8c5537e 100644 --- a/ServerExplorer/Code/DataTransfer/Column.cs +++ b/ServerExplorer/Code/DataTransfer/Column.cs @@ -5,7 +5,7 @@ using System.Xml.Serialization; namespace ServerExplorer.Code.DataTransfer { [Serializable] - class Column + public class Column { [XmlAttribute] public string Name { get; set; } diff --git a/ServerExplorer/Code/DataTransfer/Database.cs b/ServerExplorer/Code/DataTransfer/Database.cs index bff1dae..2b33efb 100644 --- a/ServerExplorer/Code/DataTransfer/Database.cs +++ b/ServerExplorer/Code/DataTransfer/Database.cs @@ -6,7 +6,7 @@ using System.Xml.Serialization; namespace ServerExplorer.Code.DataTransfer { [Serializable] - class Database + public class Database { [XmlAttribute] public string Name { get; set; } diff --git a/ServerExplorer/Code/DataTransfer/Server.cs b/ServerExplorer/Code/DataTransfer/Server.cs index 1f9032d..e80d3fe 100644 --- a/ServerExplorer/Code/DataTransfer/Server.cs +++ b/ServerExplorer/Code/DataTransfer/Server.cs @@ -5,7 +5,7 @@ using System.Xml.Serialization; namespace ServerExplorer.Code.DataTransfer { [Serializable] - internal class Server + public class Server { [XmlAttribute] public string Name { get; set; } diff --git a/ServerExplorer/Code/DataTransfer/Table.cs b/ServerExplorer/Code/DataTransfer/Table.cs index 8012650..a25fbb3 100644 --- a/ServerExplorer/Code/DataTransfer/Table.cs +++ b/ServerExplorer/Code/DataTransfer/Table.cs @@ -6,13 +6,14 @@ using System.Xml.Serialization; namespace ServerExplorer.Code.DataTransfer { [Serializable] - class Table + public class Table { [XmlAttribute] public string Schema { get; set; } [XmlAttribute] public string Name { get; set; } - + [XmlAttribute] + public string Type { get; set; } private readonly List _columns = new List(); diff --git a/ServerExplorer/Code/DataTransfer/User.cs b/ServerExplorer/Code/DataTransfer/User.cs index b8e2910..1f34c07 100644 --- a/ServerExplorer/Code/DataTransfer/User.cs +++ b/ServerExplorer/Code/DataTransfer/User.cs @@ -4,7 +4,7 @@ using System.Xml.Serialization; namespace ServerExplorer.Code.DataTransfer { [Serializable] - class User + public class User { [XmlAttribute] public bool ImplicitUser { get; set; } diff --git a/ServerExplorer/Controls/CustomTextBox.cs b/ServerExplorer/Controls/CustomTextBox.cs index 67b78d2..b56fb75 100644 --- a/ServerExplorer/Controls/CustomTextBox.cs +++ b/ServerExplorer/Controls/CustomTextBox.cs @@ -18,7 +18,7 @@ namespace ServerExplorer.Controls [DllImport("User32.dll", CharSet = CharSet.Auto)] private static extern IntPtr SendMessage(IntPtr h, int msg, int wParam, int[] lParam); - public void SetTabWidth(int tabWidth) + protected void SetTabWidth(int tabWidth) { SendMessage(this.Handle, EM_SETTABSTOPS, 1, new int[] { tabWidth * 4 }); } diff --git a/ServerExplorer/Controls/WindowButton.cs b/ServerExplorer/Controls/WindowButton.cs index 6f26b0a..a2525f2 100644 --- a/ServerExplorer/Controls/WindowButton.cs +++ b/ServerExplorer/Controls/WindowButton.cs @@ -11,22 +11,22 @@ namespace ServerExplorer.Controls { #region Properties - private Form window = null; + private Form _window = null; public Form Window { - get { return window; } - set { window = value; } + get { return _window; } + set { _window = value; } } - private bool active = false; + private bool _active = false; public bool Active { - get { return active; } + get { return _active; } set { - active = value; + _active = value; //Font = active ? fntActive : fntNormal; - ForeColor = active ? Color.Black : Color.Gray; + ForeColor = _active ? Color.Black : Color.Gray; } } @@ -47,8 +47,8 @@ namespace ServerExplorer.Controls void WindowButton_Click(object sender, EventArgs e) { - if (window == null) { return; } - window.Activate(); + if (_window == null) { return; } + _window.Activate(); } #endregion diff --git a/ServerExplorer/Properties/Resources.Designer.cs b/ServerExplorer/Properties/Resources.Designer.cs deleted file mode 100644 index 70341dc..0000000 --- a/ServerExplorer/Properties/Resources.Designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Este código fue generado por una herramienta. -// Versión de runtime:4.0.30319.488 -// -// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si -// se vuelve a generar el código. -// -//------------------------------------------------------------------------------ - -namespace ServerExplorer.Properties { - using System; - - - /// - /// Clase de recurso con establecimiento inflexible de tipos, para buscar cadenas traducidas, etc. - /// - // StronglyTypedResourceBuilder generó automáticamente esta clase - // a través de una herramienta como ResGen o Visual Studio. - // Para agregar o quitar un miembro, edite el archivo .ResX y, a continuación, vuelva a ejecutar ResGen - // con la opción /str o vuelva a generar su proyecto de VS. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Devuelve la instancia de ResourceManager almacenada en caché utilizada por esta clase. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ServerExplorer.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Reemplaza la propiedad CurrentUICulture del subproceso actual para todas las - /// búsquedas de recursos mediante esta clase de recurso con establecimiento inflexible de tipos. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - } -} diff --git a/ServerExplorer/Properties/Resources.resx b/ServerExplorer/Properties/Resources.resx deleted file mode 100644 index ffecec8..0000000 --- a/ServerExplorer/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/ServerExplorer/Properties/Settings.Designer.cs b/ServerExplorer/Properties/Settings.Designer.cs deleted file mode 100644 index 4f94b09..0000000 --- a/ServerExplorer/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Este código fue generado por una herramienta. -// Versión de runtime:4.0.30319.488 -// -// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si -// se vuelve a generar el código. -// -//------------------------------------------------------------------------------ - -namespace ServerExplorer.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/ServerExplorer/Properties/Settings.settings b/ServerExplorer/Properties/Settings.settings deleted file mode 100644 index abf36c5..0000000 --- a/ServerExplorer/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ServerExplorer/ServerExplorer.csproj b/ServerExplorer/ServerExplorer.csproj index 3bdc86a..d9febdd 100644 --- a/ServerExplorer/ServerExplorer.csproj +++ b/ServerExplorer/ServerExplorer.csproj @@ -148,25 +148,6 @@ FrmServidores.cs - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - diff --git a/ServerExplorer/UI/FrmBaseDatos.Designer.cs b/ServerExplorer/UI/FrmBaseDatos.Designer.cs index aff4d35..a6d4718 100644 --- a/ServerExplorer/UI/FrmBaseDatos.Designer.cs +++ b/ServerExplorer/UI/FrmBaseDatos.Designer.cs @@ -45,8 +45,8 @@ this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.btnRefresh = new System.Windows.Forms.Button(); this.lsvTablas = new ServerExplorer.Controls.CustomListView(); - this.colNombreTabla = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.colEsquema = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colNombreTabla = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.colTipo = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.lsvColumnas = new ServerExplorer.Controls.CustomListView(); this.colNombreColumna = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -83,13 +83,12 @@ // // menuBaseDatos // - this.menuBaseDatos.Dock = System.Windows.Forms.DockStyle.None; this.menuBaseDatos.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.archivoToolStripMenuItem, this.menuConfiguracion}); - this.menuBaseDatos.Location = new System.Drawing.Point(7, 195); + this.menuBaseDatos.Location = new System.Drawing.Point(0, 0); this.menuBaseDatos.Name = "menuBaseDatos"; - this.menuBaseDatos.Size = new System.Drawing.Size(195, 24); + this.menuBaseDatos.Size = new System.Drawing.Size(806, 24); this.menuBaseDatos.TabIndex = 9; this.menuBaseDatos.Text = "menuBaseDatos"; this.menuBaseDatos.Visible = false; @@ -100,6 +99,7 @@ this.archivoToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuCargar, this.menuGuardar}); + this.archivoToolStripMenuItem.MergeIndex = 0; this.archivoToolStripMenuItem.Name = "archivoToolStripMenuItem"; this.archivoToolStripMenuItem.Size = new System.Drawing.Size(92, 20); this.archivoToolStripMenuItem.Text = "Base de Datos"; @@ -107,14 +107,14 @@ // menuCargar // this.menuCargar.Name = "menuCargar"; - this.menuCargar.Size = new System.Drawing.Size(116, 22); + this.menuCargar.Size = new System.Drawing.Size(152, 22); this.menuCargar.Text = "Cargar"; this.menuCargar.Click += new System.EventHandler(this.menuCargar_Click); // // menuGuardar // this.menuGuardar.Name = "menuGuardar"; - this.menuGuardar.Size = new System.Drawing.Size(116, 22); + this.menuGuardar.Size = new System.Drawing.Size(152, 22); this.menuGuardar.Text = "Guardar"; this.menuGuardar.Click += new System.EventHandler(this.menuGuardar_Click); // @@ -149,8 +149,8 @@ // // lblTituloTabla // - this.lblTituloTabla.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.lblTituloTabla.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.lblTituloTabla.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.lblTituloTabla.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblTituloTabla.ForeColor = System.Drawing.SystemColors.ControlLightLight; @@ -163,8 +163,8 @@ // // lblTituloDB // - this.lblTituloDB.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.lblTituloDB.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.lblTituloDB.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.lblTituloDB.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblTituloDB.ForeColor = System.Drawing.SystemColors.ControlLightLight; @@ -210,9 +210,9 @@ // // splitContainer1 // - this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; this.splitContainer1.Location = new System.Drawing.Point(1, 32); this.splitContainer1.Name = "splitContainer1"; @@ -231,7 +231,6 @@ this.splitContainer1.Panel2.Controls.Add(this.lblTituloTabla); this.splitContainer1.Panel2.Controls.Add(this.btnDocGen); this.splitContainer1.Panel2.Controls.Add(this.lsvColumnas); - this.splitContainer1.Panel2.Controls.Add(this.menuBaseDatos); this.splitContainer1.Panel2.Controls.Add(this.btnGenerar); this.splitContainer1.Panel2.Controls.Add(this.btnVerDatos); this.splitContainer1.Size = new System.Drawing.Size(806, 511); @@ -252,13 +251,13 @@ // lsvTablas // this.lsvTablas.AllowSorting = true; - this.lsvTablas.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.lsvTablas.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.lsvTablas.CheckBoxes = true; this.lsvTablas.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.colNombreTabla, this.colEsquema, + this.colNombreTabla, this.colTipo}); this.lsvTablas.FullRowSelect = true; this.lsvTablas.Location = new System.Drawing.Point(3, 40); @@ -270,15 +269,15 @@ this.lsvTablas.View = System.Windows.Forms.View.Details; this.lsvTablas.SelectedIndexChanged += new System.EventHandler(this.lsvTablas_SelectedIndexChanged); // + // colEsquema + // + this.colEsquema.Text = "Esquema"; + // // colNombreTabla // this.colNombreTabla.Text = "Tabla"; this.colNombreTabla.Width = 169; // - // colEsquema - // - this.colEsquema.Text = "Esquema"; - // // colTipo // this.colTipo.Text = "Tipo"; @@ -287,9 +286,9 @@ // lsvColumnas // this.lsvColumnas.AllowSorting = false; - this.lsvColumnas.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.lsvColumnas.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.lsvColumnas.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.colNombreColumna, this.colTipoDatos, @@ -329,8 +328,8 @@ // // txtConString // - this.txtConString.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.txtConString.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtConString.Location = new System.Drawing.Point(120, 6); this.txtConString.Name = "txtConString"; this.txtConString.ReadOnly = true; @@ -346,6 +345,7 @@ this.Controls.Add(this.splitContainer1); this.Controls.Add(this.btnCopiarConString); this.Controls.Add(this.lblConString); + this.Controls.Add(this.menuBaseDatos); this.Controls.Add(this.txtConString); this.MainMenuStrip = this.menuBaseDatos; this.Name = "FrmBaseDatos"; @@ -355,7 +355,6 @@ this.menuBaseDatos.PerformLayout(); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false); - this.splitContainer1.Panel2.PerformLayout(); this.splitContainer1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); diff --git a/ServerExplorer/UI/FrmBaseDatos.cs b/ServerExplorer/UI/FrmBaseDatos.cs index 0fa3c01..6ed56cc 100644 --- a/ServerExplorer/UI/FrmBaseDatos.cs +++ b/ServerExplorer/UI/FrmBaseDatos.cs @@ -4,6 +4,9 @@ using System.Windows.Forms; using System.Data.SqlClient; using System.Xml.Serialization; using ServerExplorer.Code; +using System.Collections.Generic; +using ServerExplorer.Code.DataTransfer; +using ServerExplorer.Code.DataAccess; namespace ServerExplorer.UI { @@ -20,22 +23,16 @@ namespace ServerExplorer.UI txtConString.Text = _config.ConnectionString; _cnx = new SqlConnection(_config.ConnectionString); - // Obtener lista de tablas - _cnx.Open(); - DataTable dt = _cnx.GetSchema("Tables"); - _cnx.Close(); - - // Mostrar todas las tablas + List
tables = TableDA.Table_GetRegs(_config.ConnectionString); lsvTablas.Items.Clear(); - foreach (DataRow dr in dt.Rows) + foreach (Table table in tables) { - ListViewItem item = lsvTablas.Items.Add((String)dr["TABLE_NAME"]); - item.SubItems.Add((String)dr["TABLE_SCHEMA"]); - item.SubItems.Add((String)dr["TABLE_TYPE"]); + ListViewItem item = lsvTablas.Items.Add(table.Schema); + item.SubItems.Add(table.Name); + item.SubItems.Add(table.Type); } - TablesToListView(); - // Limpiar Columnas + TablesToListView(); lsvColumnas.Items.Clear(); } @@ -51,8 +48,8 @@ namespace ServerExplorer.UI { _config.Tablas.Add(new TablaInfo { - Esquema = item.SubItems[1].Text, - Nombre = item.SubItems[0].Text + Esquema = item.SubItems[0].Text, + Nombre = item.SubItems[1].Text }); } } @@ -81,8 +78,8 @@ namespace ServerExplorer.UI item.Checked = false; do { - if (String.Compare(_config.Tablas[i].Esquema, item.SubItems[1].Text, StringComparison.Ordinal) == 0 && - String.Compare(_config.Tablas[i].Nombre, item.SubItems[0].Text, StringComparison.Ordinal) == 0) + if (String.Compare(_config.Tablas[i].Esquema, item.SubItems[0].Text, StringComparison.Ordinal) == 0 && + String.Compare(_config.Tablas[i].Nombre, item.SubItems[1].Text, StringComparison.Ordinal) == 0) { item.Checked = true; break; @@ -120,8 +117,6 @@ namespace ServerExplorer.UI _config = config; } - - private void frmBaseDatos_Load(object sender, EventArgs e) { Initialize(); @@ -145,8 +140,8 @@ namespace ServerExplorer.UI ListViewItem item = lsvTablas.SelectedItems[0]; // Recordar tabla seleccionada - _tableSchema = item.SubItems[1].Text; - _tableName = item.SubItems[0].Text; + _tableSchema = item.SubItems[0].Text; + _tableName = item.SubItems[1].Text; // Establecer titulo de la lista de columnas lblTituloTabla.Text = _tableSchema + @"." + _tableName;