Browse Source

Changed 'entity_type_source_id' to 'vocabulary_usage_id' and 'bundle_source_id' to 'term_usage_id'.

Chun-Huai Cheng 9 years ago
parent
commit
6efecb6f80

+ 1 - 1
tripal_entities/includes/tripal_entities.tables.inc

@@ -84,7 +84,7 @@ function tripal_entities_populate_entity_tables() {
                 'type_table' => $tablename,
                 'field' => $local_id
               );
-              if (!chado_select_record('tripal_term_usage', array('bundle_source_id'), $values, array('has_record' => TRUE))) {
+              if (!chado_select_record('tripal_term_usage', array('term_usage_id'), $values, array('has_record' => TRUE))) {
                 chado_insert_record('tripal_term_usage', $values);
               }
 

+ 5 - 4
tripal_entities/tripal_entities.install

@@ -149,7 +149,7 @@ function tripal_entities_add_tripal_vocabulary_usage_table(){
   $schema = array (
     'table' => 'tripal_vocabulary_usage',
     'fields' => array (
-      'entity_type_source_id' => array(
+      'vocabulary_usage_id' => array(
         'type' => 'serial',
         'not null' => TRUE
       ),
@@ -174,7 +174,7 @@ function tripal_entities_add_tripal_vocabulary_usage_table(){
       ),
     ),
     'primary key' => array (
-      0 => 'entity_type_source_id'
+      0 => 'vocabulary_usage_id'
     ),
     'foreign keys' => array (
       'tripal_vocabulary' => array (
@@ -204,7 +204,7 @@ function tripal_entities_add_tripal_term_usage_table(){
   $schema = array (
     'table' => 'tripal_term_usage',
     'fields' => array (
-      'bundle_source_id' => array(
+      'term_usage_id' => array(
         'type' => 'serial',
         'not null' => TRUE
       ),
@@ -229,7 +229,7 @@ function tripal_entities_add_tripal_term_usage_table(){
       ),
     ),
     'primary key' => array (
-      0 => 'bundle_source_id'
+      0 => 'term_usage_id'
     ),
     'foreign keys' => array (
       'tripal_term' => array (
@@ -449,6 +449,7 @@ function tripal_entities_schema() {
       'bundle' => array('bundle'),
     ),
   );
+  
   return $schema;
 }