BUG: refs #0283. Got this setup working for postgres.

I had not tested the setup for postgres, and the previous setup
actually copied a mysql.ini testing config file over the pgsql.ini
testing config file.  This version fixes that, and some other bugs
that I found when cleaning up the pgsql test and getting them to work.
Furthermore, there are some fixes and improvements to the helloworld module
that were useful in testing this script.

Author: Michael Grauer

modules/helloworld/database/mysql/1.0.0.sql

@@ -2,7 +2,6 @@
 CREATE TABLE IF NOT EXISTS `helloworld_hello` (
   `hello_id` bigint(20) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`hello_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
+) DEFAULT CHARSET=utf8 ;
 
-
-INSERT INTO `midas`.`helloworld_hello` (`hello_id`) VALUES ('1');
+INSERT INTO `helloworld_hello` (`hello_id`) VALUES (default(`hello_id`));

modules/helloworld/database/pgsql/1.0.0.sql

@@ -0,0 +1,5 @@
+CREATE TABLE helloworld_hello (
+    hello_id serial PRIMARY KEY
+);
+
+INSERT INTO helloworld_hello DEFAULT VALUES;

modules/helloworld/database/upgrade/1.0.1.php

@@ -28,7 +28,10 @@ public function mysql()
 
   public function pgsql()
     {
-    
+    $sql = "CREATE TABLE helloworld_helloupgrade1 (
+                  id serial PRIMARY KEY
+                  );";
+    $this->db->query($sql);
     }
 
   public function postUpgrade()

modules/helloworld/database/upgrade/1.0.2.php

@@ -32,7 +32,10 @@ public function mysql()
 
   public function pgsql()
     {
-    
+    $sql = "CREATE TABLE helloworld_helloupgrade2 (
+                  id serial PRIMARY KEY
+                  );";
+    $this->db->query($sql);
     }
 
   public function postUpgrade()

tests/DatabaseSetup.php

@@ -66,12 +66,19 @@ function loadDbAdapter($testConfigDir, $dbType)
   }
 
 
-function dropTables($db)
+function dropTables($db, $dbType)
   {
   $tables = $db->listTables();
   foreach($tables as $table)
     {
-    $sql = "drop table `".$table."`";
+    if($dbType === 'mysql')
+      {
+      $sql = "drop table `".$table."`";
+      }
+    else if($dbType === 'pgsql')
+      {
+      $sql = 'drop table "'.$table.'"';
+      }
     $db->query($sql);
     }
   }
@@ -164,31 +171,16 @@ function installModules($utilityComponent)
     }
   }
 
-// cleanup the lock files
-function releaseLocks()
+// cleanup the lock file
+function releaseLock($dbType)
   {
-  if(file_exists(BASE_PATH.'/tests/configs/lock.pgsql.ini'))
+  if(file_exists(BASE_PATH.'/tests/configs/lock.'.$dbType.'.ini'))
     {
-    rename(  BASE_PATH.'/tests/configs/lock.pgsql.ini',BASE_PATH.'/tests/configs/pgsql.ini');
-    }
-  if(file_exists(BASE_PATH.'/tests/configs/lock.mysql.ini'))
-    {
-    rename(  BASE_PATH.'/tests/configs/lock.mysql.ini',BASE_PATH.'/tests/configs/mysql.ini');
+    rename(  BASE_PATH.'/tests/configs/lock.'.$dbType.'.ini',BASE_PATH.'/tests/configs/'.$dbType.'.ini');
     }
   }
 
 
-
-
-
-
-
-
-
-
-
-
-
 // general setup
 
 error_reporting(E_ALL | E_STRICT);
@@ -271,16 +263,15 @@ function releaseLocks()
   try
     {
     $dbAdapter = loadDbAdapter($testConfigDir, $dbType);
-    dropTables($dbAdapter);
-
+    dropTables($dbAdapter, $dbType);
     require_once BASE_PATH.'/core/controllers/components/UtilityComponent.php';
     $utilityComponent = new UtilityComponent();
 
     installCore($dbAdapter, $dbType, $utilityComponent);
     createDefaultAssetstore();
     installModules($utilityComponent);
 
-    releaseLocks();
+    releaseLock($dbType);
     }
   catch(Zend_Exception $ze)
     {