From 90219f284fd72055e213afd4ce4c832a3e052a9a Mon Sep 17 00:00:00 2001 From: administrator Date: Sat, 9 Jun 2012 08:19:37 -0400 Subject: [PATCH] Fix issue in install_db.sql where it was not properly creating Stored Procedures UpdateServiceProperties and GetDNSRecordsTotal in Version 1.2.2.1 --- WebsitePanel/Database/install_db.sql | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/WebsitePanel/Database/install_db.sql b/WebsitePanel/Database/install_db.sql index 409346a2..b26e034d 100644 --- a/WebsitePanel/Database/install_db.sql +++ b/WebsitePanel/Database/install_db.sql @@ -35694,7 +35694,7 @@ BEGIN GR.RecordName FROM GlobalDNSRecords AS GR WHERE GR.PackageID = @TmpPackageID - AND GR.RecordType + GR.RecordName NOT IN (SELECT RecordType + RecordName FROM @Records) + AND GR.RecordType COLLATE DATABASE_DEFAULT + GR.RecordName COLLATE DATABASE_DEFAULT NOT IN (SELECT RecordType + RecordName FROM @Records) SET @ParentPackageID = NULL @@ -35722,7 +35722,7 @@ SELECT GR.RecordName FROM GlobalDNSRecords AS GR WHERE GR.ServerID = @ServerID -AND GR.RecordType + GR.RecordName NOT IN (SELECT RecordType + RecordName FROM @Records) +AND GR.RecordType COLLATE DATABASE_DEFAULT + GR.RecordName COLLATE DATABASE_DEFAULT NOT IN (SELECT RecordType + RecordName FROM @Records) -- select SERVICES DNS records @@ -35736,7 +35736,7 @@ SELECT GR.RecordName FROM GlobalDNSRecords AS GR WHERE GR.ServiceID IN (SELECT ServiceID FROM PackageServices WHERE PackageID = @PackageID) -AND GR.RecordType + GR.RecordName NOT IN (SELECT RecordType + RecordName FROM @Records) +AND GR.RecordType COLLATE DATABASE_DEFAULT + GR.RecordName COLLATE DATABASE_DEFAULT NOT IN (SELECT RecordType + RecordName FROM @Records) SELECT @@ -35795,6 +35795,8 @@ RETURN + + @@ -44088,8 +44090,8 @@ EXEC sp_xml_preparedocument @idoc OUTPUT, @xml -- Execute a SELECT statement that uses the OPENXML rowset provider. DELETE FROM ServiceProperties -WHERE ServiceID = @ServiceID -AND PropertyName IN +WHERE ServiceID = @ServiceID +AND PropertyName COLLATE DATABASE_DEFAULT IN ( SELECT PropertyName FROM OPENXML(@idoc, '/properties/property', 1)