From ff5c7055347e0871a81a2cfd68fa48866edbaa4a Mon Sep 17 00:00:00 2001
From: sitereactor <unknown@kiln.example.com>
Date: Fri, 13 Jul 2012 12:38:04 -0200
Subject: [PATCH] Adding Sql Azure as Database option in installer

---
 .../install/steps/database.ascx               |  3 +-
 .../install/steps/database.ascx.cs            | 85 +++----------------
 .../Installer/js/jquery.main.js               |  2 +-
 3 files changed, 15 insertions(+), 75 deletions(-)

diff --git a/src/umbraco.presentation/install/steps/database.ascx b/src/umbraco.presentation/install/steps/database.ascx
index 82f0c5313d..661b86726c 100644
--- a/src/umbraco.presentation/install/steps/database.ascx
+++ b/src/umbraco.presentation/install/steps/database.ascx
@@ -24,7 +24,7 @@
                             <ul>
                             <li>
                                 <input type="radio" id="databaseOptionBlank" name="database" value="blank" />
-                                <label for="databaseOptionBlank">I already have a blank SQL Server or MySQL database</label>
+                                <label for="databaseOptionBlank">I already have a blank SQL Server, SQL Azure or MySQL database</label>
 
                             </li>
                             <li>
@@ -61,6 +61,7 @@
 								    <asp:DropDownList runat="server" ID="DatabaseType" CssClass="sel">
 									    <asp:ListItem Value="" Text="Please choose" Selected="True" />
 									    <asp:ListItem Value="SqlServer" Text="Microsoft SQL Server" />
+									    <asp:ListItem Value="SqlAzure" Text="SQL Azure" />
 									    <asp:ListItem Value="MySql" Text="MySQL" />
 									  
 								    </asp:DropDownList>
diff --git a/src/umbraco.presentation/install/steps/database.ascx.cs b/src/umbraco.presentation/install/steps/database.ascx.cs
index 22c2ca313d..cb862bb748 100644
--- a/src/umbraco.presentation/install/steps/database.ascx.cs
+++ b/src/umbraco.presentation/install/steps/database.ascx.cs
@@ -1,15 +1,11 @@
 using System;
-using System.Data;
 using System.Data.Common;
-using System.Drawing;
-using System.Web;
 using System.Web.UI.WebControls;
 using System.Web.UI.HtmlControls;
 using umbraco.DataLayer;
 using umbraco.DataLayer.Utility.Installer;
 using System.IO;
 using umbraco.IO;
-using System.Threading;
 
 namespace umbraco.presentation.install.steps
 {
@@ -141,6 +137,8 @@ namespace umbraco.presentation.install.steps
                     dbinit.Text = "$('#databaseOptionAdvanced').click();$('#databaseOptionAdvanced').change();";
                 else if(DatabaseType.SelectedValue == "SqlServer")
                     dbinit.Text = "$('#databaseOptionBlank').click();$('#databaseOptionBlank').change();";
+                else if (DatabaseType.SelectedValue == "SqlAzure")
+                    dbinit.Text = "$('#databaseOptionBlank').click();$('#databaseOptionBlank').change();";
                 //toggleVisible(DatabaseConnectionString, ManualConnectionString);
 
             // Make sure ASP.Net displays the password text
@@ -150,10 +148,6 @@ namespace umbraco.presentation.install.steps
         /// <summary>
         /// Shows the installation/upgrade panel.
         /// </summary>
-        /// 
-
-        
-
         protected void saveDBConfig(object sender, EventArgs e)
         {
             Helper.setProgress(5, "Saving database connection...", "");
@@ -173,69 +167,6 @@ namespace umbraco.presentation.install.steps
             installing.Visible = true;
         }
 
-
-        /// <summary>
-        /// Tries to connect to the database and saves the new connection string if successful.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="e">The event arguments.</param>
-        /// 
-    
-        /*
-        protected void DatabaseConnectButton_Click(object sender, EventArgs e)
-        {
-            
-            // Build the new connection string
-            DbConnectionStringBuilder connectionStringBuilder = CreateConnectionString();
-            Helper.setSession(sesssionAlias, 5, "Connecting...", "");
-
-            // Try to connect to the database
-            Exception error = null;
-            try
-            {
-                ISqlHelper sqlHelper = DataLayerHelper.CreateSqlHelper(connectionStringBuilder.ConnectionString);
-                m_Installer = sqlHelper.Utility.CreateInstaller();
-                
-                if (!Installer.CanConnect)
-                    throw new Exception("The installer cannot connect to the database.");
-                else
-                    Helper.setSession(sesssionAlias, 20, "Connection opened", "");
-            }
-            catch (Exception ex)
-            {
-                error = new Exception("Database connection initialisation failed.", ex);
-                Helper.setSession(sesssionAlias, -5, "Database connection initialisation failed.", error.Message);
-            }
-
-            // Save the new connection string
-            if (error == null)
-            {
-                try
-                {
-                    GlobalSettings.DbDSN = connectionStringBuilder.ConnectionString;
-                }
-                catch (Exception ex)
-                {
-                    error = new Exception("Could not save the web.config file. Please modify the connection string manually.", ex);
-                    Helper.setSession(sesssionAlias, -1, "Could not save the web.config file. Please modify the connection string manually.", error.Message);
-                }
-            }
-
-            // Show database installation panel or error message if not successful
-            if (error == null)
-            {
-                //ph_dbError.Visible = false;
-                //settings.Visible = false;
-                installOrUpgrade();
-            }
-            else
-            {
-                ph_dbError.Visible = true;
-                lt_dbError.Text = String.Format("{0} {1}", error.Message, error.InnerException.Message);
-            }
-        }
-        */ 
-
         /// <summary>
         /// Creates the connection string with the values the user has supplied.
         /// </summary>
@@ -248,19 +179,27 @@ namespace umbraco.presentation.install.steps
             {
                 connectionStringBuilder.ConnectionString = ConnectionString.Text;
             }
-            else if (!IsEmbeddedDatabase)
+            else if (!IsEmbeddedDatabase && !DatabaseType.SelectedValue.Contains("SqlAzure"))//If database is not embedded or of type Sql Azure
             {
                 connectionStringBuilder["server"] = DatabaseServer.Text;
                 connectionStringBuilder["database"] = DatabaseName.Text;
                 connectionStringBuilder["user id"] = DatabaseUsername.Text;
                 connectionStringBuilder["password"] = DatabasePassword.Text;
             }
+            else if (!IsEmbeddedDatabase && DatabaseType.SelectedValue.Contains("SqlAzure"))//If database is not embedded and of type Sql Azure
+            {
+                connectionStringBuilder.ConnectionString =
+                    string.Format("Server=tcp:{0}.database.windows.net;Database={1};User ID={2}@{0};Password={3}",
+                                  DatabaseServer.Text, DatabaseName.Text, DatabaseUsername.Text, DatabasePassword.Text);
+            }
             else if (Request["database"] == "embedded")
             {
                 connectionStringBuilder.ConnectionString = @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=|DataDirectory|\Umbraco.sdf";
             }
 
-            if (!String.IsNullOrEmpty(Request["database"]) && !String.IsNullOrEmpty(DatabaseType.SelectedValue) && !DatabaseType.SelectedValue.Contains("SqlServer")
+            if (!String.IsNullOrEmpty(Request["database"]) && !String.IsNullOrEmpty(DatabaseType.SelectedValue) 
+                && !DatabaseType.SelectedValue.Contains("SqlServer")
+                && !DatabaseType.SelectedValue.Contains("SqlAzure")
                 && Request["database"] != "advanced")
             {
                 connectionStringBuilder["datalayer"] = DatabaseType.SelectedValue;
diff --git a/src/umbraco.presentation/umbraco_client/Installer/js/jquery.main.js b/src/umbraco.presentation/umbraco_client/Installer/js/jquery.main.js
index 2c44df87ba..21e0879ce0 100644
--- a/src/umbraco.presentation/umbraco_client/Installer/js/jquery.main.js
+++ b/src/umbraco.presentation/umbraco_client/Installer/js/jquery.main.js
@@ -168,7 +168,7 @@ function toggleDatabaseOption(selectValNew) {
         //jQuery(step1 + ' .row').hide();
 
         if (selectValNew != '') {
-            if (selectValNew == 'SqlServer' || selectValNew == 'MySql') {
+            if (selectValNew == 'SqlServer' || selectValNew == 'SqlAzure' || selectValNew == 'MySql') {
                 jQuery('#database-blank-inputs').show();
                 //instructionText.show();
                 buttonBox.show();