mvhub-dev team mailing list archive

["James Reynolds Jr." <jreynoldm@xxxxxxxxx>]

James Reynolds Jr. has proposed merging lp:~jimbox-comcast/mvhub/remove_additional_seq into lp:mvhub.

Requested reviews:
  Dan MacNeil (omacneil)
Related bugs:
  #592401 more sequences to drop synonym_id_sequence user_id_sequence   
  https://bugs.launchpad.net/bugs/592401


Adds a script to drop two vestigial sequences from the database.
-- 
https://code.launchpad.net/~jimbox-comcast/mvhub/remove_additional_seq/+merge/28350
Your team MVHub Developers is subscribed to branch lp:mvhub.

=== modified file 'app-mvhub/conf/sql_select.lib'
--- app-mvhub/conf/sql_select.lib	2010-06-19 19:50:00 +0000
+++ app-mvhub/conf/sql_select.lib	2010-06-23 20:22:24 +0000
@@ -458,18 +458,6 @@
 WHERE 
   program_id = ?   
 
-[SYNONYM_STEM_X_CONCAT_SUBMITTED_WORDS]
-SELECT 
-  our_aggregate_concat(submitted_word) 
-AS 
-  submitted_words 
-FROM 
-  synonym_stem 
-GROUP BY 
-  synonym_id 
-ORDER BY
-  submitted_words
-
 [SYNONYM_STEM_X_WORD_STEM]  
 SELECT DISTINCT 
   word_stem

=== modified file 'app-mvhub/setup/database/sql/004_remove_unused_tables_and_seq.sql'
--- app-mvhub/setup/database/sql/004_remove_unused_tables_and_seq.sql	2010-06-18 19:39:24 +0000
+++ app-mvhub/setup/database/sql/004_remove_unused_tables_and_seq.sql	2010-06-23 20:22:24 +0000
@@ -1,4 +1,3 @@
---add version number and note before you add the other sql
 BEGIN;
 
 INSERT INTO version_log ( version,note ) 
@@ -7,5 +6,11 @@
 DROP SEQUENCE user_type_type_id_seq, log_category_search_search_id_seq, web_requests_id_seq CASCADE;
 
 DROP TABLE user_type, log_category_search, web_requests CASCADE;
+<<<<<<< TREE
      
+=======
+
+DROP SEQUENCE user_type_type_id_seq, log_category_search_search_id_seq, web_requests_id_seq,
+     	         
+>>>>>>> MERGE-SOURCE
 COMMIT;

=== renamed file 'app-mvhub/setup/database/sql/005_synonym_cat_functions.sql' => 'app-mvhub/setup/database/sql/005_synonym_cat_functions.sql.THIS'
=== added file 'app-mvhub/setup/database/sql/006_remove_more_unused_seq.sql'
--- app-mvhub/setup/database/sql/006_remove_more_unused_seq.sql	1970-01-01 00:00:00 +0000
+++ app-mvhub/setup/database/sql/006_remove_more_unused_seq.sql	2010-06-23 20:22:24 +0000
@@ -0,0 +1,8 @@
+BEGIN;
+
+INSERT INTO version_log ( version,note ) 
+	VALUES (6,'Removes two unused seq');
+
+DROP SEQUENCE synonym_id_sequence, user_id_sequence;
+     	         
+COMMIT;

=== modified file 'lib-mvhub/lib/MVHub/Synonyms.pm'
--- lib-mvhub/lib/MVHub/Synonyms.pm	2010-06-09 15:43:40 +0000
+++ lib-mvhub/lib/MVHub/Synonyms.pm	2010-06-23 20:22:24 +0000
@@ -37,8 +37,11 @@
 # 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_CONCAT_SUBMITTED_WORDS');
+    my $sql
+        = 'SELECT our_aggregate_concat(submitted_word) AS submitted_words '
+        . 'FROM synonym_stem '
+        . 'GROUP BY synonym_id '
+        . 'ORDER BY submitted_words';
     my $rows_aref = $dbh->selectcol_arrayref($sql);
     foreach ( @{$rows_aref} ) {
         s/,//g;