Ensure that text filter formats get set to an allowed value during the migration...

[project/cck.git] / cck.install

diff --git a/cck.install b/cck.install
index d0a9952..49a2f9b 100644 (file)
--- a/cck.install
+++ b/cck.install
@@ -1,18 +1,15 @@
 <?php
-// $Id$
 /**
  * Implementation of hook_install().
  */
 function cck_install() {
-  drupal_install_schema('cck');
+  
 }
 
-
 /**
  * Implementation of hook_uninstall().
  */
 function cck_uninstall() {
-  drupal_uninstall_schema('cck');
   db_query("DELETE FROM {variable} WHERE name LIKE 'cck_extra_weights_%'");
 }
 
@@ -24,6 +21,7 @@ function cck_uninstall() {
  * don't want in core.
  */
 function cck_schema() {
+ 
   $schema['cck_field_settings'] = array(
     'fields' => array(
       'field_name' => array(
@@ -32,12 +30,25 @@ function cck_schema() {
         'not null' => TRUE,
         'description' => 'The name of the field.',
       ),
+      'entity_type' => array(
+        'type' => 'varchar',
+        'length' => 32,
+        'not null' => TRUE,
+        'default' => '',
+        'description' => 'The name of the entity type, NULL for field settings.',
+      ),
       'bundle' => array(
         'type' => 'varchar',
         'length' => 32,
         'not null' => FALSE,
         'description' => 'The name of the bundle, NULL for field settings.',
       ),
+     'language' => array(
+        'type' => 'varchar',
+        'length' => 32,
+        'not null' => FALSE,
+        'description' => 'The name of the language, NULL for field settings.',
+      ),     
       'setting_type' => array(
         'type' => 'varchar',
         'length' => 32,
@@ -48,12 +59,12 @@ function cck_schema() {
         'type' => 'varchar',
         'length' => 128,
         'not null' => TRUE,
-        'description' => 'The name of the setting that CCK is managing.',
+        'description' => 'The name of the setting that CCK is managing (default_value_php, allowed_values_php, etc).',
       ),
       'setting_option' => array(
         'type' => 'text',
         'size' => 'medium',
-        'not null' => TRUE,
+        'not null' => FALSE,
         'description' => 'The custom value for this setting.',
       ),
     ),
@@ -61,31 +72,24 @@ function cck_schema() {
   return $schema;
 }
 
-/*
-// TODO need to make the following changes to update existing data:
-// Set up and move to content module to handle upgrade path:
-
-function content_update_7000() {
- 
-  - Add new columns for:
-      - deleted: defaults to 0
-      - data: contains serialized array of complete $instance.
-  - Module-defined field settings are now at $field['settings'][...]
-  - Module-defined widget settings are now at $instance['widget']['settings']
-  - Module-defined instance settings are at $instance['settings']
-  - Field settings should be limited to settings that affect the schema,
-    all others should be instance settings.
-  - Display is now $instance['display'] instead of $instance['display_settings']
-  - Display format now adds label to every context instead of one label at the top level, for a more consistent structure.  
-  - Rename display options, formatter names are now prefixed with field name.      
-  - No more content type: $field['widget']['type_name'] becomes $instance['bundle']
-  - Required is now $instance['required'] instead of $field['required']
-  - Label is now $instance['label'] instead of $field['widget']['label']
-  - Description is now $instance['description'] instead of $field['widget']['description']
-  - Weight is now $instance['weight'] instead of $field['widget']['weight']
-  - Text module textareas are now a separate field type so the db schema won't change.
-  - Text module format columns are always set and don't change by field settings so the db schema won't change.
-  - Text and Number with allowed values are now made into List field types.
-  - Default values are moved out of the field settings into the cck_field_settings table maintained by CCK
+function cck_update_7000() {
+  if (!db_field_exists('cck_field_settings', 'entity_type')) {
+    $field = array(
+      'type' => 'varchar',
+      'length' => 32,
+      'not null' => TRUE,
+      'default' => '',
+      'description' => 'The name of the entity type, NULL for field settings.',
+    );
+    db_add_field('cck_field_settings', 'entity_type', $field);
+  }
+  if (!db_field_exists('cck_field_settings', 'language')) {
+    $field = array(
+      'type' => 'varchar',
+      'length' => 32,
+      'not null' => FALSE,
+      'description' => 'The name of the language, NULL for field settings.',
+    );     
+    db_add_field('cck_field_settings', 'language', $field);
+  }
 }
-*/
\ No newline at end of file