Browse Source

Fixed upgrade issue

Stephen Ficklin 8 years ago
parent
commit
2280770017
2 changed files with 5 additions and 4 deletions
  1. 3 2
      tripal/tripal.install
  2. 2 2
      tripal_chado/tripal_chado.install

+ 3 - 2
tripal/tripal.install

@@ -714,8 +714,9 @@ function tripal_update_7300() {
       'not null' => TRUE
     );
     db_change_field('tripal_vocab', 'vocabulary', 'vocabulary',$spec);
-  } catch (\PDOException $e) {
+  } 
+  catch (\PDOException $e) {
     $error = $e->getMessage();
     throw new DrupalUpdateException('Could not perform update: '. $error);
   }
-}
+}

+ 2 - 2
tripal_chado/tripal_chado.install

@@ -723,7 +723,7 @@ function tripal_chado_update_7301() {
 
         // Now move the records over.
         $sql = "
-          INSERT INTO {$cbundle_table}
+          INSERT INTO {$cbundle_table} (entity_id, record_id, nid)
            SELECT CE.entity_id, CE.record_id, CE.nid
             FROM {chado_entity} CE
               INNER JOIN {tripal_entity} TE ON CE.entity_id = TE.id
@@ -741,4 +741,4 @@ function tripal_chado_update_7301() {
     $error = $e->getMessage();
     throw new DrupalUpdateException('Could not perform update: '. $error);
   }
-}
+}