Merge lp:~jimbox-comcast/mvhub/remove_additional_seq into lp:~mvhub-commit/mvhub/trunk

[James Reynolds Jr.]

Adds a script to drop two vestigial sequences from the database.

[Dan MacNeil (omacneil)]

The old version of 004_remove_unused_tables_and_seq.sql (now in trunk)

...did some stuff and set version_log.version =4

The new version does **more** stuff, but under many circumstances this will never be called.

If a version_log.version == 4, 004_remove_unused_tables_seq.sql won't be run.

You need to put the new stuff in 006_remove_more_unused_seq.sql

In app-mvhub/project-tools/bin/mv_update_development the database is DROPped , new data is loaded and all the schema updating scripts in app-mvhub/setup/database/sql are run.

In production, we don't care to wipe old data, so only the new, unrun sql scripts are run.

Make fix & push branch

review: Needs Fixing

[James Reynolds Jr. (jimbox-comcast)]

I reverted to revision 412 and created 006_remove_more_unused_seq.sql as requested.

[Dan MacNeil (omacneil)]

There are conflict markers in the diff against trunk for this merge request.

Those should be resolved.

Merging trunk into the the branch and resolve conflicts before pushing branch again

SYNONYM_STEM_X_CONCAT_SUBMITTED_WORDS should not be removed. Once you merge trunk and priya's schema updates, the test will pass for this.

[Dan MacNeil (omacneil)]

null op to change merge status

review: Needs Fixing

[Saroun Sek (saroun-sek)]

> There are conflict markers in the diff against trunk for this merge request.
>
> Those should be resolved.
>
>
> Merging trunk into the the branch and resolve conflicts before pushing branch
> again
>
>
> SYNONYM_STEM_X_CONCAT_SUBMITTED_WORDS should not be removed. Once you merge
> trunk and priya's schema updates, the test will pass for this.

SYNONYM_STEM_X_CONCAT_SUBMITTED_WORDS gets a conflict with my branch. I chose SYNONYM_STEM_X_SUBMITTED_WORDS as the name, which caused a conflict. I don't think he'll need to add it back in since when he merges with mine, it will give a conflict both ways.

[Dan MacNeil (omacneil)]

Sadly, 006 while was a valid schemea version number when the comment was written, it iis no longer a valid number as we now have 007,008

See:

  Executing 005_synonym_cat_functions.sql...SUCCESS
  Executing 007_alter_tables_and_remove_old.sql...SUCCESS
  Executing 008_drop_zip_distance_table.sql...SUCCESS
  Executing 009_drop_get_agency_name.sql...SUCCESS

So your script will never be called on the production database as the production database is at verison 007

The scheama updating script only runs scripts with a lower number than the version number in the database.

review: Needs Fixing

[Dan MacNeil (omacneil)]

@Saroun

I may not be completely undertanding you, but as a rule, conflicts should be fixed in the branch before merging back to trunk.

[James Reynolds Jr. (jimbox-comcast)]

The script now runs when the version value is 10.

[Dan MacNeil (omacneil)]

looks good approve

review: Approve

=== added file 'app-mvhub/setup/database/sql/005_synonym_cat_functions.sql'
--- app-mvhub/setup/database/sql/005_synonym_cat_functions.sql	1970-01-01 00:00:00 +0000
+++ app-mvhub/setup/database/sql/005_synonym_cat_functions.sql	2010-07-12 17:43:42 +0000
@@ -0,0 +1,24 @@
+BEGIN;
+INSERT INTO version_log (version, note ) 
+	VALUES (5,'adding two functions to return concatenated synonyms');
+
+/* Returns the concatenation of its 2 arguments, separated by a comma and a space. */
+CREATE OR REPLACE FUNCTION  our_concat(text, text) RETURNS text AS 
+$$
+    SELECT $1 || ', ' || $2;
+ $$  LANGUAGE sql
+  STABLE
+  RETURNS NULL ON NULL INPUT;
+
+
+/* Returns a concatenation of all of the values in a grouped column, 
+   delimited by a comma and a space. 
+*/
+DROP AGGREGATE IF EXISTS our_aggregate_concat(text);
+
+CREATE AGGREGATE our_aggregate_concat (
+    sfunc = our_concat,
+    basetype = text,
+    stype = text
+);
+COMMIT;

=== removed file 'app-mvhub/setup/database/sql/005_synonym_cat_functions.sql'
--- app-mvhub/setup/database/sql/005_synonym_cat_functions.sql	2010-06-18 19:40:06 +0000
+++ app-mvhub/setup/database/sql/005_synonym_cat_functions.sql	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-BEGIN;
-INSERT INTO version_log (version, note ) 
-	VALUES (5,'adding two functions to return concatenated synonyms');
-
-/* Returns the concatenation of its 2 arguments, separated by a comma and a space. */
-CREATE OR REPLACE FUNCTION  our_concat(text, text) RETURNS text AS 
-$$
-    SELECT $1 || ', ' || $2;
- $$  LANGUAGE sql
-  STABLE
-  RETURNS NULL ON NULL INPUT;
-
-
-/* Returns a concatenation of all of the values in a grouped column, 
-   delimited by a comma and a space. 
-*/
-DROP AGGREGATE IF EXISTS our_aggregate_concat(text);
-
-CREATE AGGREGATE our_aggregate_concat (
-    sfunc = our_concat,
-    basetype = text,
-    stype = text
-);
-COMMIT;

=== added file 'app-mvhub/setup/database/sql/010_remove_more_unused_seq.sql'
--- app-mvhub/setup/database/sql/010_remove_more_unused_seq.sql	1970-01-01 00:00:00 +0000
+++ app-mvhub/setup/database/sql/010_remove_more_unused_seq.sql	2010-07-12 17:43:42 +0000
@@ -0,0 +1,8 @@
+BEGIN;
+
+INSERT INTO version_log ( version,note ) 
+	VALUES (10,'Removes one unused seq');
+
+DROP SEQUENCE user_id_sequence;
+     	         
+COMMIT;

=== modified file 'lib-mvhub/lib/MVHub/Synonyms.pm'
--- lib-mvhub/lib/MVHub/Synonyms.pm	2010-06-29 19:21:04 +0000
+++ lib-mvhub/lib/MVHub/Synonyms.pm	2010-07-12 17:43:42 +0000
@@ -37,6 +37,7 @@
 # one word synonyms of each other.
 sub fetch_synonyms_from_db {
     my $dbh = MVHub::Utils::DB::get_dbh();
+
     my $sql = MVHub::Utils::DB::get_sql_select_statement(
         'SYNONYM_STEM_X_SUBMITTED_WORDS');