yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added SQL Server Express user instance file and updated installation procedure to include SQL Server Express user instance support.

Browse Source 
[TFS Changeset #65148]
This commit is contained in:
codegecko
2010-03-31 15:50:49 +00:00
parent 408be002a8
commit 6f63d5e8f9
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
umbraco/presentation/App_Data/umbraco.mdf Normal file
View File

Binary file not shown.

BIN
umbraco/presentation/App_Data/umbraco_log.LDF Normal file
View File

Binary file not shown.

1
umbraco/presentation/install/steps/detect.ascx
View File

@@ -26,6 +26,7 @@
AutoPostBack="True" onselectedindexchanged="DatabaseType_SelectedIndexChanged">
<asp:ListItem Value="SqlServer" Text="Microsoft SQL Server" Selected="True" />
<asp:ListItem Value="MySql" Text="MySQL" />
<asp:ListItem Value="SqlServerE" Text="Embedded database (Microsoft SQL Server Express user instance)" />
<asp:ListItem Value="VistaDB,VistaDB For Umbraco" Text="Embedded database (VistaDB)" />
<asp:ListItem Value="" Text="Custom connection" />
</asp:DropDownList>

9
umbraco/presentation/install/steps/detect.ascx.cs
View File

@@ -43,7 +43,8 @@ namespace umbraco.presentation.install.steps
/// </summary>
protected bool IsEmbeddedDatabase
{
get { return DatabaseType.SelectedItem.Text.Contains("VistaDB"); }
get { return (DatabaseType.SelectedItem.Text.Contains("VistaDB") ||
(DatabaseType.SelectedValue=="SqlServerE")); }
}
/// <summary>
@@ -224,8 +225,12 @@ namespace umbraco.presentation.install.steps
connectionStringBuilder["user id"] = DatabaseUsername.Text;
connectionStringBuilder["password"] = DatabasePassword.Text;
}
else if (DatabaseType.SelectedValue == ("SqlServerE"))
{
connectionStringBuilder.ConnectionString = @"Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\umbraco.mdf;Integrated Security=True;User Instance=True;Database=umbraco";
}
if (!String.IsNullOrEmpty(DatabaseType.SelectedValue) && DatabaseType.SelectedValue!="SqlServer")
if (!String.IsNullOrEmpty(DatabaseType.SelectedValue) && !DatabaseType.SelectedValue.Contains("SqlServer"))
connectionStringBuilder["datalayer"] = DatabaseType.SelectedValue;
return connectionStringBuilder;

2
umbraco/presentation/install/steps/detect.ascx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.