Fix bug: NULL description on cloned trees.

[refs #70468220]
overview · May 28, 2014 · ea2ed1a · ea2ed1a
1 parent b977af0
commit ea2ed1a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/conf/evolutions/default/62.sql b/conf/evolutions/default/62.sql
@@ -0,0 +1,17 @@
+# --- !Ups
+
+BEGIN;
+
+UPDATE tree SET description = '' WHERE description IS NULL;
+
+ALTER TABLE tree ALTER COLUMN description SET NOT NULL;
+
+COMMIT;
+
+# --- !Downs
+
+BEGIN;
+
+ALTER TABLE tree ALTER COLUMN description DROP NOT NULL;
+
+COMMIT;
diff --git a/worker/src/main/scala/org/overviewproject/clone/TreeCloner.scala b/worker/src/main/scala/org/overviewproject/clone/TreeCloner.scala
@@ -7,9 +7,9 @@ object TreeCloner extends InDatabaseCloner {
   override def cloneQuery: SqlQuery =
     SQL("""
         INSERT INTO tree (id, document_set_id, title, document_count, lang, supplied_stop_words,
-          important_words, created_at)
+          important_words, description, created_at)
           SELECT ({cloneDocumentSetId} << 32) | ({documentSetIdMask} & id), {cloneDocumentSetId}, title, document_count, lang, supplied_stop_words, 
-            important_words, created_at
+            important_words, description, created_at
           FROM tree WHERE document_set_id = {sourceDocumentSetId}
         """)
-}
+}