From ce257c55f498477f21f091007e55e88b528d8eda Mon Sep 17 00:00:00 2001 From: robvde Date: Fri, 28 Sep 2012 22:42:26 +0400 Subject: [PATCH] Fixed wrongly calculated subdomains --- WebsitePanel/Database/update_db.sql | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index 99990a38..4808b170 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -1699,6 +1699,25 @@ GO +USE [WebsitePanelMerge] +GO +/****** Object: UserDefinedFunction [dbo].[CalculateQuotaUsage] Script Date: 09/28/2012 22:39:53 ******/ +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO + + + + + + + + + + + + ALTER FUNCTION [dbo].[CalculateQuotaUsage] ( @PackageID int, @@ -1728,7 +1747,7 @@ AS ELSE IF @QuotaID = 54 -- sub-domains SET @Result = (SELECT COUNT(D.DomainID) FROM PackagesTreeCache AS PT INNER JOIN Domains AS D ON D.PackageID = PT.PackageID - WHERE IsSubDomain = 1 AND IsInstantAlias = 0 AND PT.ParentPackageID = @PackageID) + WHERE IsSubDomain = 1 AND IsInstantAlias = 0 AND IsDomainPointer = 0 AND PT.ParentPackageID = @PackageID) ELSE IF @QuotaID = 220 -- domain pointers SET @Result = (SELECT COUNT(D.DomainID) FROM PackagesTreeCache AS PT INNER JOIN Domains AS D ON D.PackageID = PT.PackageID @@ -1821,7 +1840,6 @@ AS RETURN @Result END - GO