#4509 Fixed refactoring problem on "Done or deleted some TODOs"

Author: skoshelev

upgradescripts/4.00-4.10/upgrade.sql

@@ -3972,30 +3972,4 @@ IF EXISTS (SELECT 1 FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[Shippi
 BEGIN
     EXEC sp_RENAME '[dbo].[ShippingByWeightByTotal]', 'ShippingByWeightByTotalRecord'
 END
-GO
-
---new setting
-IF NOT EXISTS (SELECT 1 FROM [Setting] WHERE [name] = N'cookiesettings.compareproductscookieexpires')
-BEGIN
-    INSERT [Setting] ([Name], [Value], [StoreId])
-    VALUES (N'cookiesettings.compareproductscookieexpires', N'240', 0)
-END
-GO
-
---new setting
-IF NOT EXISTS (SELECT 1 FROM [Setting] WHERE [name] = N'cookiesettings.recentlyviewedproductscookieexpires')
-BEGIN
-    INSERT [Setting] ([Name], [Value], [StoreId])
-    VALUES (N'cookiesettings.recentlyviewedproductscookieexpires', N'240', 0)
-END
-GO
-
-
---new setting
-IF NOT EXISTS (SELECT 1 FROM [Setting] WHERE [name] = N'cookiesettings.customercookieexpires')
-BEGIN
-    INSERT [Setting] ([Name], [Value], [StoreId])
-    VALUES (N'cookiesettings.customercookieexpires', N'8760', 0)
-END
-GO
-
+GO

upgradescripts/4.20-4.30 (under development)/upgrade.sql

@@ -2753,4 +2753,28 @@ GO
 --drop the "LanguagePackImport" stored procedure
 IF EXISTS (SELECT 1 FROM sys.objects WHERE OBJECT_ID = OBJECT_ID(N'[LanguagePackImport]') AND OBJECTPROPERTY(OBJECT_ID, N'IsProcedure') = 1)
     DROP PROCEDURE [LanguagePackImport];
+GO
+
+--new setting
+IF NOT EXISTS (SELECT 1 FROM [Setting] WHERE [name] = N'cookiesettings.compareproductscookieexpires')
+BEGIN
+    INSERT [Setting] ([Name], [Value], [StoreId])
+    VALUES (N'cookiesettings.compareproductscookieexpires', N'240', 0)
+END
+GO
+
+--new setting
+IF NOT EXISTS (SELECT 1 FROM [Setting] WHERE [name] = N'cookiesettings.recentlyviewedproductscookieexpires')
+BEGIN
+    INSERT [Setting] ([Name], [Value], [StoreId])
+    VALUES (N'cookiesettings.recentlyviewedproductscookieexpires', N'240', 0)
+END
+GO
+
+--new setting
+IF NOT EXISTS (SELECT 1 FROM [Setting] WHERE [name] = N'cookiesettings.customercookieexpires')
+BEGIN
+    INSERT [Setting] ([Name], [Value], [StoreId])
+    VALUES (N'cookiesettings.customercookieexpires', N'8760', 0)
+END
 GO