- Patch #150245 by webchick, bjaspan, ralf, Arancaytar et al: move the .schema files into .install files to prevent mistakes.

2 files changed, 17 insertions, 15 deletions

diff --git a/modules/trigger/trigger.install b/modules/trigger/trigger.install
index 13dd08ae1..14aaf2edd 100644
--- a/modules/trigger/trigger.install
+++ b/modules/trigger/trigger.install
@@ -19,3 +19,20 @@ function trigger_uninstall() {
   // Remove tables.
   drupal_uninstall_schema('trigger');
 }
+
+/**
+ * Implementation of hook_schema().
+ */
+function trigger_schema() {
+  $schema['trigger_assignments'] = array(
+    'fields' => array(
+      'hook' => array('type' => 'varchar', 'length' => 32, 'not null' => TRUE, 'default' => ''),
+      'op' => array('type' => 'varchar', 'length' => 32, 'not null' => TRUE, 'default' => ''),
+      'aid' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
+      'weight' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
+    ),
+    'primary key' => array('hook', 'op', 'aid'),
+  );
+  return $schema;
+}
+
diff --git a/modules/trigger/trigger.schema b/modules/trigger/trigger.schema
deleted file mode 100644
index 1b06b97d3..000000000
--- a/modules/trigger/trigger.schema
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// $Id$
-
-function trigger_schema() {
-  $schema['trigger_assignments'] = array(
-    'fields' => array(
-      'hook' => array('type' => 'varchar', 'length' => 32, 'not null' => TRUE, 'default' => ''),
-      'op' => array('type' => 'varchar', 'length' => 32, 'not null' => TRUE, 'default' => ''),
-      'aid' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
-      'weight' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
-    ),
-    'primary key' => array('hook', 'op', 'aid'),
-  );
-  return $schema;
-}