From 07efbd695ec11be22a7b3208594eaed1e8c5ed55 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Wed, 10 Dec 2014 23:03:33 -0800 Subject: [PATCH] Merging with main --- WebsitePanel/Database/update_db.sql | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index 88f9e430..10aa2b73 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -1,6 +1,4 @@ -USE [${install.database}] -GO - + -- update database version DECLARE @build_version nvarchar(10), @build_date datetime SET @build_version = N'${release.version}' @@ -5451,7 +5449,8 @@ CREATE TABLE RDSServers Name NVARCHAR(255), FqdName NVARCHAR(255), Description NVARCHAR(255), - RDSCollectionId INT/* FOREIGN KEY REFERENCES RDSCollection (ID)*/ + RDSCollectionId INT, + ConnectionEnabled BIT NOT NULL DEFAULT(1) ) GO @@ -6746,13 +6745,6 @@ exec sp_executesql @sql, N'@StartRow int, @MaximumRows int, @PackageID int, @Fil RETURN -IF NOT EXISTS(SELECT * FROM sys.columns - WHERE [name] = N'ConnectionEnabled' AND [object_id] = OBJECT_ID(N'RDSServers')) -BEGIN - ALTER TABLE [RDSServers] - ADD ConnectionEnabled BIT NOT NULL DEFAULT(1) -END - GO