Index: README.txt
===================================================================
RCS file: /cvs/drupal/contributions/modules/actions/README.txt,v
retrieving revision 1.3
diff -u -r1.3 README.txt
--- README.txt	24 Jan 2006 22:17:28 -0000	1.3
+++ README.txt	28 Feb 2006 19:16:35 -0000
@@ -3,7 +3,7 @@
 ********************************************************************
 Name: Actions Module
 Author: John VanDyk <jvandyk at iastate dot edu>
-Drupal: 4.6
+Drupal: 4.7
 ********************************************************************
 DESCRIPTION:
 
@@ -23,22 +23,13 @@
 1. Place the entire actions directory into your Drupal modules/
    directory.
 
-2. Create the necessary database tables using the actions.mysql
-   file and the tool of your choice. For example, you could use
-   PhpMyAdmin, to upload the actions.mysql file or run the following
-   from the command line:
-
-     mysql -u user -p drupal < actions.mysql
-
-   Replace 'user' with the MySQL username that has permission to modify
-   the database, and 'drupal' with the database being written to. The
-   database must already be created.
-
-3. Enable the action module by navigating to:
+2. Enable the action module by navigating to:
 
      administer > modules
+     
+   Enabling the module will create the necessary database tables for you.
 
-4. If you want anyone besides the administrative user to be able
+3. If you want anyone besides the administrative user to be able
    to configure actions (usually a bad idea), they must be given
    the "administer actions" access permission:
    
Index: actions.mysql
===================================================================
RCS file: actions.mysql
diff -N actions.mysql
--- actions.mysql	24 Jan 2006 22:17:28 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-# $Id: actions.mysql,v 1.2 2006/01/24 22:17:28 jvandyk Exp $
-
-# --------------------------------------------------------
-
-#
-# Table structure for table `actions`
-#
-
-CREATE TABLE `actions` (
-  `aid` varchar(255) NOT NULL default '0',
-  `type` varchar(255) NOT NULL default '',
-  `func` varchar(255) NOT NULL default '',
-  `params` longtext NOT NULL,
-  `description` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`aid`),
-  KEY `func` (`func`)
-) TYPE=MyISAM /*!40100 DEFAULT CHARACTER SET utf8 */;
-    
-# --------------------------------------------------------
-
-#
-# Table structure for table `actions_registry`
-#
-
-CREATE TABLE `actions_registry` (
-  `aid` int(10) unsigned NOT NULL default '0',
-  `module` varchar(255) NOT NULL default '',
-  `id` int(10) unsigned NOT NULL default '0',
-  KEY `module` (`module`),
-  KEY `id` (`id`),
-  KEY `aid` (`aid`)
-) TYPE=MyISAM /*!40100 DEFAULT CHARACTER SET utf8 */;
-   
\ No newline at end of file
Index: actions.pgsql
===================================================================
RCS file: actions.pgsql
diff -N actions.pgsql
--- actions.pgsql	6 Feb 2005 03:20:51 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
--- --------------------------------------------------------
-
---
--- Table structure for table actions
---
-
-CREATE TABLE actions (
-  aid varchar(255) NOT NULL default '0',
-  type varchar(255) NOT NULL default '',
-  func varchar(255) NOT NULL default '',
-  params text NOT NULL,
-  description varchar(255) NOT NULL default '',
-  PRIMARY KEY  (aid)
-);
-
-CREATE INDEX actions_func ON actions USING HASH (func);
-
--- --------------------------------------------------------
-
---
--- Table structure for table actions_registry
---
-
-CREATE TABLE actions_registry (
-  aid integer NOT NULL default '0',
-  module varchar(255) NOT NULL default '',
-  id integer NOT NULL default '0'
-);
-
-CREATE INDEX actions_registry_module ON actions_registry USING HASH (module);
-CREATE INDEX actions_registry_id ON actions_registry USING HASH (id);
-CREATE INDEX actions_registry_aid ON actions_registry USING HASH (aid);
Index: actions.install
===================================================================
RCS file: actions.install
diff -N actions.install
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ actions.install	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,78 @@
+<?php
+
+function actions_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysqli':
+    case 'mysql':
+      $query1 = db_query(
+<<<QUERY
+CREATE TABLE actions (
+  aid varchar(255) NOT NULL default '0',
+  type varchar(255) NOT NULL default '',
+  func varchar(255) NOT NULL default '',
+  params longtext NOT NULL,
+  description varchar(255) NOT NULL default '',
+  PRIMARY KEY  (aid),
+  KEY func (func)
+) /*!40100 DEFAULT CHARACTER SET utf8 */;
+QUERY
+      );
+
+      $query2 = db_query(
+<<<QUERY
+CREATE TABLE actions_registry (
+  aid int(10) unsigned NOT NULL default '0',
+  module varchar(255) NOT NULL default '',
+  id int(10) unsigned NOT NULL default '0',
+  KEY module (module),
+  KEY id (id),
+  KEY aid (aid)
+) /*!40100 DEFAULT CHARACTER SET utf8 */;
+QUERY
+      );
+      if ($query1 && $query2) {
+        drupal_set_message(t('The actions module has successfully added two tables to the MySQL database'));
+      }
+      else {
+        drupal_set_message(t('Drupal was unable to install the database tables for the actions module.'));
+      }
+      break;
+    
+    case 'pgsql':
+      $query1 = db_query(
+<<<QUERY
+CREATE TABLE actions (
+  aid varchar(255) NOT NULL default '0',
+  type varchar(255) NOT NULL default '',
+  func varchar(255) NOT NULL default '',
+  params text NOT NULL,
+  description varchar(255) NOT NULL default '',
+  PRIMARY KEY  (aid)
+);
+QUERY
+      );
+      
+       $query2 = db_query('CREATE INDEX actions_func ON actions USING HASH (func);');
+       $query3 = db_query(
+<<<QUERY
+CREATE TABLE actions_registry (
+  aid integer NOT NULL default '0',
+  module varchar(255) NOT NULL default '',
+  id integer NOT NULL default '0'
+);
+QUERY
+       );
+
+      $query4 = db_query('CREATE INDEX actions_registry_module ON actions_registry USING HASH (module);');
+      $query5 = db_query('CREATE INDEX actions_registry_id ON actions_registry USING HASH (id);');
+      $query6 = db_query('CREATE INDEX actions_registry_aid ON actions_registry USING HASH (aid);');
+
+      if ($query1 && $query2 && $query3 && $query4 && $query5 && $query6) {
+        drupal_set_message(t('The actions module has successfully added two tables to the PostgreSQL database'));
+      }
+      else {
+        drupal_set_message(t('Drupal was unable to install the database tables for the actions module.'));
+      }      
+      break;
+  }
+}