Microsoft SQL Server 2012 support

Upgraded: Database scripts install_db.sql and upload_db.sql in order to support MSSQL2012
Upgraded: Installer to allow setup WebsitePanel with MSSQL2012
Added: MsSqlServer2012.cs
This commit is contained in:
Alejandro 2012-05-12 14:17:46 -04:00
parent e294a3db8a
commit bb347537af
24 changed files with 1179 additions and 18 deletions

View file

@ -55,6 +55,7 @@
<MenuItem pageID="SpaceMsSql2000" resourceGroup="MsSQL2000"/>
<MenuItem pageID="SpaceMsSql2005" resourceGroup="MsSQL2005"/>
<MenuItem pageID="SpaceMsSql2008" resourceGroup="MsSQL2008"/>
<MenuItem pageID="SpaceMsSql2012" resourceGroup="MsSQL2012"/>
<MenuItem pageID="SpaceMySql4" resourceGroup="MySQL4"/>
<MenuItem pageID="SpaceMySql5" resourceGroup="MySQL5"/>
</MenuItems>
@ -97,6 +98,7 @@
<MenuItem pageID="SpaceMsSql2000" resourceGroup="MsSQL2000"/>
<MenuItem pageID="SpaceMsSql2005" resourceGroup="MsSQL2005"/>
<MenuItem pageID="SpaceMsSql2008" resourceGroup="MsSQL2008"/>
<MenuItem pageID="SpaceMsSql2012" resourceGroup="MsSQL2012"/>
<MenuItem pageID="SpaceMySql4" resourceGroup="MySQL4"/>
<MenuItem pageID="SpaceMySql5" resourceGroup="MySQL5"/>
<MenuItem pageID="SpaceOdbc" resourceGroup="OS" quota="OS.ODBC"/>

View file

@ -340,6 +340,26 @@
</Module>
</Content>
</Page>
<Page name="SpaceMsSql2012" roles="Administrator,Reseller,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="SqlDatabases" title="Sql2012Databases" icon="mssql_48.png">
<Settings>
<Add name="GroupName" value="MsSQL2012" />
</Settings>
</Module>
<Module moduleDefinitionID="SqlUsers" title="Sql2012Users" icon="db_user_48.png">
<Settings>
<Add name="GroupName" value="MsSQL2012" />
</Settings>
</Module>
</Content>
</Page>
<Page name="SpaceMySql4" roles="Administrator,Reseller,User" hidden="True">
<Content id="LeftPane">

View file

@ -522,6 +522,12 @@
<data name="ModuleTitle.Sql2008Users" xml:space="preserve">
<value>SQL Server 2008 Logins</value>
</data>
<data name="ModuleTitle.Sql2012Databases" xml:space="preserve">
<value>SQL Server 2012 Databases</value>
</data>
<data name="ModuleTitle.Sql2012Users" xml:space="preserve">
<value>SQL Server 2012 Logins</value>
</data>
<data name="ModuleTitle.SQLDatabaseProperties" xml:space="preserve">
<value>SQL Database Properties</value>
</data>

View file

@ -282,6 +282,12 @@
<data name="PageTitle.SpaceMsSql2008" xml:space="preserve">
<value>{user} - {space} - SQL Server 2008</value>
</data>
<data name="PageName.SpaceMsSql2012" xml:space="preserve">
<value>SQL Server 2012</value>
</data>
<data name="PageTitle.SpaceMsSql2012" xml:space="preserve">
<value>{user} - {space} - SQL Server 2012</value>
</data>
<data name="PageTitle.SpaceMsSql2005" xml:space="preserve">
<value>{user} - {space} - SQL Server 2005</value>
</data>

View file

@ -1809,6 +1809,24 @@
<data name="Quota.MsSQL2008.Users" xml:space="preserve">
<value>Users</value>
</data>
<data name="Quota.MsSQL2012.Backup" xml:space="preserve">
<value>Database Backups</value>
</data>
<data name="Quota.MsSQL2012.Databases" xml:space="preserve">
<value>Databases</value>
</data>
<data name="Quota.MsSQL2012.MaxDatabaseSize" xml:space="preserve">
<value>Max Database Size, MB</value>
</data>
<data name="Quota.MsSQL2012.Restore" xml:space="preserve">
<value>Database Restores</value>
</data>
<data name="Quota.MsSQL2012.Truncate" xml:space="preserve">
<value>Database Truncate</value>
</data>
<data name="Quota.MsSQL2012.Users" xml:space="preserve">
<value>Users</value>
</data>
<data name="Quota.MySQL5.Backup" xml:space="preserve">
<value>Database Backups</value>
</data>
@ -1848,6 +1866,9 @@
<data name="ResourceGroup.MsSQL2008" xml:space="preserve">
<value>SQL Server 2008</value>
</data>
<data name="ResourceGroup.MsSQL2012" xml:space="preserve">
<value>SQL Server 2012</value>
</data>
<data name="ResourceGroup.MySQL5" xml:space="preserve">
<value>MySQL 5</value>
</data>
@ -2040,6 +2061,12 @@
<data name="ServiceItemType.MsSQL2008User" xml:space="preserve">
<value>MS SQL 2008 User</value>
</data>
<data name="ServiceItemType.MsSQL2012Database" xml:space="preserve">
<value>MS SQL 2012 Database</value>
</data>
<data name="ServiceItemType.MsSQL2012User" xml:space="preserve">
<value>MS SQL 2012 User</value>
</data>
<data name="ServiceItemType.MySQL4Database" xml:space="preserve">
<value>MySQL 4 Database</value>
</data>
@ -3151,6 +3178,9 @@
<data name="Quota.MsSQL2008.MaxLogSize" xml:space="preserve">
<value>Max Log Size, MB</value>
</data>
<data name="Quota.MsSQL2012.MaxLogSize" xml:space="preserve">
<value>Max Log Size, MB</value>
</data>
<data name="Error.EXCHANGE_UPDATE_MAILBOX_PERMISSIONS" xml:space="preserve">
<value>Error updating mailbox permissions. See audit log for more details.</value>
</data>
@ -4693,6 +4723,9 @@
<data name="ReportResourceGroup.MsSQL2008" xml:space="preserve">
<value>SQL Server 2008</value>
</data>
<data name="ReportResourceGroup.MsSQL2012" xml:space="preserve">
<value>SQL Server 2012</value>
</data>
<data name="WebAppGallery.ApplicationInstallationError" xml:space="preserve">
<value>Error while install application pack</value>
</data>

View file

@ -165,4 +165,7 @@
<data name="lclMSSQL2008Resources.Text" xml:space="preserve">
<value>Microsoft SQL 2008 Quotas</value>
</data>
<data name="lclMSSQL2012Resources.Text" xml:space="preserve">
<value>Microsoft SQL 2012 Quotas</value>
</data>
</root>

View file

@ -160,6 +160,24 @@
</asp:Repeater>
</asp:PlaceHolder>
<asp:PlaceHolder runat="server" ID="MsSQL2012" Visible="false">
<tr>
<th colspan="2">
<br />
<div class="FormButtonsBar">
<div class="FormSectionHeader"><asp:Localize ID="Localize3" runat="server" meta:resourcekey="lclMSSQL2012Resources" /></div>
</div>
</th>
</tr>
<asp:Repeater runat="server" ID="MsSQL2012_Quotas">
<ItemTemplate>
<tr>
<td class="Width20Pcs" style="white-space: nowrap;"><strong><%# GetSharedLocalizedString("Quota." + GetQuotaItemName((string)Container.DataItem)) %>:</strong></td>
<td><%# GetQuotaItemAllocatedValue((string)Container.DataItem) %></td>
</tr>
</ItemTemplate>
</asp:Repeater>
</asp:PlaceHolder>
<asp:PlaceHolder runat="server" ID="MySQL4" Visible="false">
<tr>

View file

@ -157,6 +157,15 @@ namespace WebsitePanel.Ecommerce.Portal.UserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder MsSQL2008;
/// <summary>
/// MsSQL2012 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder MsSQL2012;
/// <summary>
/// Localize3 control.
/// </summary>
@ -175,6 +184,15 @@ namespace WebsitePanel.Ecommerce.Portal.UserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater MsSQL2008_Quotas;
/// <summary>
/// MsSQL2012_Quotas control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater MsSQL2012_Quotas;
/// <summary>
/// MySQL4 control.
/// </summary>

View file

@ -302,6 +302,7 @@ namespace WebsitePanel.Portal
AddDatabaseVersion(cntx, ResourceGroups.MsSql2000, items, versions);
AddDatabaseVersion(cntx, ResourceGroups.MsSql2005, items, versions);
AddDatabaseVersion(cntx, ResourceGroups.MsSql2008, items, versions);
AddDatabaseVersion(cntx, ResourceGroups.MsSql2012, items, versions);
AddDatabaseVersion(cntx, ResourceGroups.MySql4, items, versions);
AddDatabaseVersion(cntx, ResourceGroups.MySql5, items, versions);
}

View file

@ -206,9 +206,11 @@ namespace WebsitePanel.Portal
sqlDatabases.AddRange(ES.Services.DatabaseServers.GetSqlDatabases(packageId, ResourceGroups.MsSql2000, false));
sqlDatabases.AddRange(ES.Services.DatabaseServers.GetSqlDatabases(packageId, ResourceGroups.MsSql2005, false));
sqlDatabases.AddRange(ES.Services.DatabaseServers.GetSqlDatabases(packageId, ResourceGroups.MsSql2008, false));
sqlDatabases.AddRange(ES.Services.DatabaseServers.GetSqlDatabases(packageId, ResourceGroups.MsSql2012, false));
sqlUsers.AddRange(ES.Services.DatabaseServers.GetSqlUsers(packageId, ResourceGroups.MsSql2000, false));
sqlUsers.AddRange(ES.Services.DatabaseServers.GetSqlUsers(packageId, ResourceGroups.MsSql2005, false));
sqlUsers.AddRange(ES.Services.DatabaseServers.GetSqlUsers(packageId, ResourceGroups.MsSql2008, false));
sqlUsers.AddRange(ES.Services.DatabaseServers.GetSqlUsers(packageId, ResourceGroups.MsSql2012, false));
}
else if (driverName == "MySql")
{

View file

@ -69,6 +69,7 @@ namespace WebsitePanel.Portal
versions.Add(ResourceGroups.MsSql2000);
versions.Add(ResourceGroups.MsSql2005);
versions.Add(ResourceGroups.MsSql2008);
versions.Add(ResourceGroups.MsSql2012);
FillDatabaseVersions(PanelSecurity.PackageId, ddlDatabaseVersion.Items, versions);
}

View file

@ -140,6 +140,8 @@ namespace WebsitePanel.Portal
PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
// add SQL Server engines
if (cntx.Groups.ContainsKey(ResourceGroups.MsSql2012))
AddDatabaseEngine(DeploymentParameterWellKnownTag.Sql, ResourceGroups.MsSql2012, GetSharedLocalizedString("ResourceGroup." + ResourceGroups.MsSql2012));
if (cntx.Groups.ContainsKey(ResourceGroups.MsSql2008))
AddDatabaseEngine(DeploymentParameterWellKnownTag.Sql, ResourceGroups.MsSql2008, GetSharedLocalizedString("ResourceGroup." + ResourceGroups.MsSql2008));
if (cntx.Groups.ContainsKey(ResourceGroups.MsSql2005))