Miscellaneous changes. Keep original end of line characters.

ServerExplorer/Code/DataAccess/DatabaseDA.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using ServerExplorer.Code.DataTransfer;
+
+namespace ServerExplorer.Code.DataAccess
+{
+    class DatabaseDA
+    {
+        public static List<Database> Database_GetRegs(string conexionString)
+        {
+            var databases = new List<Database>();
+            var cnx = new SqlConnection(conexionString);
+            cnx.Open();
+            DataTable dt = cnx.GetSchema("Databases");
+            cnx.Close();
+            foreach (DataRow dr in dt.Rows)
+            {
+                databases.Add(new Database
+                    {
+                        Name = (String) dr["database_name"],
+                        CreateDate = (DateTime) dr["create_date"]
+                    });
+            }
+            return databases;
+        }
+    }
+}

ServerExplorer/Code/DataAccess/ServerDA.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Sql;
+using ServerExplorer.Code.DataTransfer;
+
+namespace ServerExplorer.Code.DataAccess
+{
+    class ServerDA
+    {
+        public static List<Server> Server_GetRegs()
+        {
+            var servers = new List<Server>();
+            SqlDataSourceEnumerator enumerador = SqlDataSourceEnumerator.Instance;
+            DataTable dtServers = enumerador.GetDataSources();
+            foreach (DataRow dr in dtServers.Rows)
+            {
+                servers.Add(new Server
+                {
+                    Name = (dr["ServerName"] == DBNull.Value) ? string.Empty : (String)dr["ServerName"],
+                    Instance = (dr["InstanceName"] == DBNull.Value) ? string.Empty : (String)dr["InstanceName"],
+                    Version = (dr["Version"] == DBNull.Value) ? "???" : (String)dr["Version"]
+                });
+            }
+            return servers;
+        }
+    }
+}

ServerExplorer/Code/DataAccess/TableDA.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ServerExplorer.Code.DataAccess
+{
+    class TableDA
+    {
+    }
+}

ServerExplorer/Code/DataTransfer/Column.cs

@@ -0,0 +1,19 @@
+
+using System;
+using System.Xml.Serialization;
+
+namespace ServerExplorer.Code.DataTransfer
+{
+    [Serializable]
+    class Column
+    {
+        [XmlAttribute]
+        public string Name { get; set; }
+        [XmlAttribute]
+        public string Type { get; set; }
+        [XmlAttribute]
+        public int Size { get; set; }
+        [XmlAttribute]
+        public bool PK { get; set; }
+    }
+}

ServerExplorer/Code/DataTransfer/Database.cs

@@ -0,0 +1,25 @@
+
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+
+namespace ServerExplorer.Code.DataTransfer
+{
+    [Serializable]
+    class Database
+    {
+        [XmlAttribute]
+        public string Name { get; set; }
+        [XmlAttribute]
+        public DateTime CreateDate { get; set; }
+
+
+        private readonly List<Table> _tables = new List<Table>();
+
+        [XmlArray]
+        public List<Table> Tables
+        {
+            get { return _tables; }
+        }
+    }
+}

ServerExplorer/Code/DataTransfer/Server.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+
+namespace ServerExplorer.Code.DataTransfer
+{
+    [Serializable]
+    internal class Server
+    {
+        [XmlAttribute]
+        public string Name { get; set; }
+        [XmlAttribute]
+        public string Instance { get; set; }
+        [XmlAttribute]
+        public string Version { get; set; }
+
+
+        private readonly List<User> _users = new List<User>();
+
+        [XmlArray]
+        public List<User> Users
+        {
+            get { return _users; }
+        }
+
+        private readonly List<Database> _databases = new List<Database>();
+
+        [XmlArray]
+        public List<Database> Databases
+        {
+            get { return _databases; }
+        }
+    }
+}

ServerExplorer/Code/DataTransfer/Table.cs

@@ -0,0 +1,25 @@
+
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+
+namespace ServerExplorer.Code.DataTransfer
+{
+    [Serializable]
+    class Table
+    {
+        [XmlAttribute]
+        public string Schema { get; set; }
+        [XmlAttribute]
+        public string Name { get; set; }
+
+
+        private readonly List<Column> _columns = new List<Column>();
+
+        [XmlArray]
+        public List<Column> Columns
+        {
+            get { return _columns; }
+        }
+    }
+}

ServerExplorer/Code/DataTransfer/User.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Xml.Serialization;
+
+namespace ServerExplorer.Code.DataTransfer
+{
+    [Serializable]
+    class User
+    {
+        [XmlAttribute]
+        public bool ImplicitUser { get; set; }
+
+        [XmlAttribute]
+        public string UserName { get; set; }
+
+        [XmlAttribute]
+        public string Password { get; set; }
+    }
+}

ServerExplorer/ServerExplorer.csproj

@@ -71,6 +71,14 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Code\Config.cs" />
+    <Compile Include="Code\DataAccess\DatabaseDA.cs" />
+    <Compile Include="Code\DataAccess\ServerDA.cs" />
+    <Compile Include="Code\DataAccess\TableDA.cs" />
+    <Compile Include="Code\DataTransfer\Column.cs" />
+    <Compile Include="Code\DataTransfer\Database.cs" />
+    <Compile Include="Code\DataTransfer\Server.cs" />
+    <Compile Include="Code\DataTransfer\Table.cs" />
+    <Compile Include="Code\DataTransfer\User.cs" />
     <Compile Include="Controls\CustomListView.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -177,7 +185,9 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Code\BussinesLogic\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

ServerExplorer/UI/FrmPrincipal.cs

@@ -85,7 +85,7 @@ namespace ServerExplorer.UI
         private void menuConectarPRUEBAS_Click(object sender, EventArgs e)
         {
             // Crear ventana de la base de datos de pruebas
-            var frm = new FrmBaseDatos("Data Source=SSSRV3;Initial Catalog=PRUEBAS;User ID=sa;Password=SLsssrv3");
+            var frm = new FrmBaseDatos("Data Source=localhost;Initial Catalog=Tests;Integrated Security=True");
             //frmBaseDatos frm = new frmBaseDatos("Data Source=DANTE;Initial Catalog=BD_AlfonsoRodriguez;Integrated Security=True");
             //frmBaseDatos frm = new frmBaseDatos("Data Source=OSKURITO;Initial Catalog=BD_AlfonsoRodriguez;Integrated Security=True");
             FrmPrincipal.AddForm(frm);

ServerExplorer/UI/FrmProcedimientos.cs

@@ -73,23 +73,33 @@ namespace ServerExplorer.UI
 
         private void LoadProcedure(string schema, string name)
         {
-            var da = new SqlDataAdapter(@"
+            SqlDataAdapter dataAdapter;
+            _cnx.Open();
+
+            if (_cnx.ServerVersion.StartsWith("10."))
+            {
+                dataAdapter = new SqlDataAdapter(@"
                     SELECT
                         ISNULL(smsp.definition, ssmsp.definition) AS [Definition]
                     FROM sys.all_objects AS sp
+                    INNER JOIN sys.schemas sn ON sp.schema_id = sn.schema_id
                     LEFT OUTER JOIN sys.sql_modules AS smsp ON smsp.object_id = sp.object_id
                     LEFT OUTER JOIN sys.system_sql_modules AS ssmsp ON ssmsp.object_id = sp.object_id
                     WHERE
-                    (sp.type = N'P' OR sp.type = N'RF' OR sp.type='PC')
-                    and
-                    (sp.name=@name and SCHEMA_NAME(sp.schema_id)=@schema)
+                        (sp.type = N'P' OR sp.type = N'RF' OR sp.type = N'PC' OR sp.type = N'IF' OR sp.type = N'FN' OR sp.type = N'TF')
+                        AND
+                        (sp.name = @name and sn.name = @schema)
                 ", _cnx);
+                dataAdapter.SelectCommand.Parameters.AddWithValue("@Name", name);
+                dataAdapter.SelectCommand.Parameters.AddWithValue("@Schema", schema);
+            }
+            else
+            {
+                return;
+            }
 
-            da.SelectCommand.Parameters.AddWithValue("@Name", name);
-            da.SelectCommand.Parameters.AddWithValue("@Schema", schema);
             var dt = new DataTable();
-            _cnx.Open();
-            da.Fill(dt);
+            dataAdapter.Fill(dt);
             _cnx.Close();
 
             // Mostrar el contenido del procedimiento

ServerExplorer/UI/FrmServidores.Designer.cs

@@ -225,7 +225,6 @@
             this.Controls.Add(this.splitContainer1);
             this.Name = "FrmServidores";
             this.Text = "Servidores";
-            this.Load += new System.EventHandler(this.Form1_Load);
             this.splitContainer1.Panel1.ResumeLayout(false);
             this.splitContainer1.Panel2.ResumeLayout(false);
             this.splitContainer1.Panel2.PerformLayout();

ServerExplorer/UI/FrmServidores.cs

@@ -1,8 +1,9 @@
 using System;
-using System.Data;
-using System.Data.Sql;
+using System.Collections.Generic;
 using System.Data.SqlClient;
 using System.Windows.Forms;
+using ServerExplorer.Code.DataAccess;
+using ServerExplorer.Code.DataTransfer;
 
 namespace ServerExplorer.UI
 {
@@ -13,22 +14,17 @@ namespace ServerExplorer.UI
             InitializeComponent();
         }
 
-        private void Form1_Load(object sender, EventArgs e)
-        {
-        }
-
         private void btnListarServidores_Click(object sender, EventArgs e)
         {
-            // Obtener listado de servidores
-            SqlDataSourceEnumerator enumerador = SqlDataSourceEnumerator.Instance;
-            DataTable servidores = enumerador.GetDataSources();
+            List<Server> servers = ServerDA.Server_GetRegs();
+
             lsvServidores.Items.Clear();
             lsvBBDD.Items.Clear();
-            foreach (DataRow dr in servidores.Rows)
+            foreach (Server server in servers)
             {
-                ListViewItem item = lsvServidores.Items.Add((String)dr["ServerName"]);
-                item.SubItems.Add((dr["InstanceName"] == DBNull.Value) ? string.Empty : (String)dr["InstanceName"]);
-                item.SubItems.Add((dr["Version"] == DBNull.Value) ? "???" : (String) dr["Version"]);
+                ListViewItem item = lsvServidores.Items.Add(server.Name);
+                item.SubItems.Add(server.Instance);
+                item.SubItems.Add(server.Version);
             }
         }
 
@@ -45,18 +41,13 @@ namespace ServerExplorer.UI
 
         private void btnListarBBDD_Click(object sender, EventArgs e)
         {
-            // Obtener todas las bases de datos
-            var cnx = new SqlConnection(BuildConnectionString());
-            cnx.Open();
-            DataTable dt = cnx.GetSchema("Databases");
-            cnx.Close();
+            List<Database> databases = DatabaseDA.Database_GetRegs(BuildConnectionString());
 
-            // Mostrar bases de datos
             lsvBBDD.Items.Clear();
-            foreach (DataRow dr in dt.Rows)
+            foreach (Database database in databases)
             {
-                ListViewItem item = lsvBBDD.Items.Add((String)dr["database_name"]);
-                item.SubItems.Add(((DateTime)dr["create_date"]).ToShortDateString());
+                ListViewItem item = lsvBBDD.Items.Add(database.Name);
+                item.SubItems.Add(database.CreateDate.ToShortDateString());
             }
         }