More fixes based on testing on devdb

mozilla-services · Dec 15, 2011 · a0bebe5 · a0bebe5
1 parent 195dbe4
commit a0bebe5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/sql/upgrade/2.3.5/create_column_if_not_exists.sql b/sql/upgrade/2.3.5/create_column_if_not_exists.sql
@@ -16,7 +16,7 @@ BEGIN
 		AND column_name = colname;
 	IF FOUND THEN
 		RETURN TRUE;
-	END;	
+	END IF;	
 
 	scripts := string_to_array(declaration, ';');
 	WHILE scripts[dex] IS NOT NULL LOOP

diff --git a/sql/upgrade/2.3.5/update_products.sql b/sql/upgrade/2.3.5/update_products.sql
@@ -10,16 +10,17 @@ SELECT create_table_if_not_exists (
 		release_channel citext not null,
 		release_name citext not null,
 		product_name citext not null,
+		min_version major_version not null,
 		constraint special_product_platforms_key 
 			primary key ( release_name, platform, repository, release_channel )
 	);
 
 	INSERT INTO special_product_platforms
-	VALUES ( 'android', 'mozilla-release', 'release', 'mobile', 'FennecAndroid' ),
-		( 'android', 'mozilla-release', 'beta', 'mobile', 'FennecAndroid' ),
-		( 'android', 'mozilla-beta', 'beta', 'mobile', 'FennecAndroid' ),
-		( 'android-arm', 'mozilla-central-android', 'nightly', 'mobile', 'FennecAndroid' ),
-		( 'android-arm', 'mozilla-central-android', 'aurora', 'mobile', 'FennecAndroid' );
+	VALUES ( 'android', 'mozilla-release', 'release', 'mobile', 'FennecAndroid', '9.0' ),
+		( 'android', 'mozilla-release', 'beta', 'mobile', 'FennecAndroid', '9.0' ),
+		( 'android', 'mozilla-beta', 'beta', 'mobile', 'FennecAndroid', '9.0' ),
+		( 'android-arm', 'mozilla-central-android', 'nightly', 'mobile', 'FennecAndroid', '9.0' ),
+		( 'android-arm', 'mozilla-central-android', 'aurora', 'mobile', 'FennecAndroid', '9.0' );
 	$x$,
 	'breakpad_rw' );
 
@@ -51,17 +52,20 @@ select COALESCE ( specials.product_name, products.product_name )
 	releases_raw.version,
 	releases_raw.beta_number,
 	releases_raw.build_id,
-	releases_raw.build_type
+	releases_raw.build_type,
+	releases_raw.platform,
+	major_version_sort(version) >= major_version_sort(rapid_release_version) as is_rapid
 from releases_raw
 	JOIN products ON releases_raw.product_name = products.release_name
 	LEFT OUTER JOIN special_product_platforms AS specials
 		ON releases_raw.platform::citext = specials.platform
 		AND releases_raw.product_name = specials.release_name
 		AND releases_raw.repository = specials.repository
 		AND releases_raw.build_type = specials.release_channel
+		AND major_version_sort(version) >= major_version_sort(min_version)
 where build_date(build_id) > ( current_date - 30 )
 	AND version_matches_channel(releases_raw.version, releases_raw.build_type)
-	AND repository NOT LIKE '%debug%';
+	AND releases_raw.repository NOT LIKE '%debug%';
 
 insert into product_versions (
     product_name,
@@ -87,9 +91,9 @@ from releases_recent
 		( releases_recent.product_name = product_versions.product_name
 			AND releases_recent.version = product_versions.release_version
 			AND releases_recent.beta_number IS NOT DISTINCT FROM product_versions.beta_number )
-where major_version_sort(version) >= major_version_sort(rapid_release_version)
-	AND product_versions.product_name IS NULL
-group by products.product_name, version, 
+where is_rapid
+    AND product_versions.product_name IS NULL
+group by releases_recent.product_name, version, 
 	releases_recent.beta_number, 
 	releases_recent.build_type::citext;
 
@@ -120,8 +124,8 @@ from releases_recent
         ( releases_recent.product_name = product_versions.product_name
             AND releases_recent.version = product_versions.release_version
             AND product_versions.beta_number = 999 )
-where major_version_sort(version) >= major_version_sort(rapid_release_version)
-    AND product_versions.product_name IS NULL
+where is_rapid
+    AND releases_recent.product_name IS NULL
     AND releases_recent.build_type ILIKE 'release'
 group by products.product_name, version;
 

diff --git a/sql/upgrade/2.3.5/upgrade.sh b/sql/upgrade/2.3.5/upgrade.sh
@@ -40,7 +40,7 @@ psql -f ${CURDIR}/productid_mapping_table.sql breakpad
 echo '*********************************************'
 echo 'modify update_products to pull FennecAndroid'
 echo 'bug 706899'
-psql -f ${CURDIR}/productid_mapping_table.sql breakpad
+psql -f ${CURDIR}/update_products.sql breakpad
 
 #change version in DB
 psql -c "SELECT update_socorro_db_version( '$VERSION' )" breakpad