Add missing SQL implementations

Jamie Snape · Jamie Snape · commit 1087892a16ee · 2014-07-14T11:26:58.000-04:00
diff --git a/modules/ldap/database/mysql/.gitignore b/modules/ldap/database/mysql/.gitignore
diff --git a/modules/ldap/database/mysql/1.0.0.sql b/modules/ldap/database/mysql/1.0.0.sql
diff --git a/modules/ldap/database/pgsql/.gitignore b/modules/ldap/database/pgsql/.gitignore
diff --git a/modules/ldap/database/pgsql/1.0.0.sql b/modules/ldap/database/pgsql/1.0.0.sql
diff --git a/modules/remoteprocessing/database/pgsql/1.0.0.sql b/modules/remoteprocessing/database/pgsql/1.0.0.sql
@@ -0,0 +1,21 @@
+
+CREATE TABLE remoteprocessing_job
+(
+  job_id serial PRIMARY KEY,
+  os character varying(512) NOT NULL,
+  condition character varying(512) NOT NULL DEFAULT '',
+  script text,
+  params text,
+  status smallint NOT NULL DEFAULT 0,
+  expiration_date timestamp without time zone,
+  creation_date timestamp without time zone,
+  start_date timestamp without time zone
+);
+
+
+CREATE TABLE remoteprocessing_job2item
+(
+  job_id bigint NOT NULL,
+  item_id bigint NOT NULL,
+  type smallint NOT NULL DEFAULT 0
+);
diff --git a/modules/remoteprocessing/database/upgrade/1.0.1.php b/modules/remoteprocessing/database/upgrade/1.0.1.php
@@ -26,12 +26,12 @@ public function preUpgrade()
 
   public function mysql()
     {
-    $sql = "ALTER TABLE remoteprocessing_job ADD creator_id bigint(20)";
-    $this->db->query($sql);
+    $this->db->query("ALTER TABLE remoteprocessing_job ADD COLUMN creator_id bigint(20);");
     }
 
   public function pgsql()
     {
+    $this->db->query("ALTER TABLE remoteprocessing_job ADD COLUMN creator_id bigint;");
     }
 
   public function postUpgrade()
diff --git a/modules/remoteprocessing/database/upgrade/1.0.2.php b/modules/remoteprocessing/database/upgrade/1.0.2.php
@@ -26,12 +26,12 @@ public function preUpgrade()
 
   public function mysql()
     {
-    $sql = "ALTER TABLE remoteprocessing_job ADD name varchar(512)";
-    $this->db->query($sql);
+    $this->db->query("ALTER TABLE remoteprocessing_job ADD COLUMN name varchar(512);");
     }
 
   public function pgsql()
     {
+    $this->db->query("ALTER TABLE remoteprocessing_job ADD COLUMN name character varying(512);");
     }
 
   public function postUpgrade()
diff --git a/modules/remoteprocessing/tests/CMakeLists.txt b/modules/remoteprocessing/tests/CMakeLists.txt
@@ -23,7 +23,7 @@ to_titlecase( ${module_name} module_name_titlecase )
 add_subdirectory( controllers )
 add_subdirectory( models )
 
-add_midas_mysql_test( ${module_name_titlecase}Api ApiTest.php )
+add_midas_test( ${module_name_titlecase}Api ApiTest.php )
 
 add_midas_style_test( Style${module_name_titlecase}AppController ${CMAKE_SOURCE_DIR}/modules/${module_name}/AppController.php )
 add_midas_style_test( Style${module_name_titlecase}Constant ${CMAKE_SOURCE_DIR}/modules/${module_name}/constant )
diff --git a/modules/remoteprocessing/tests/controllers/CMakeLists.txt b/modules/remoteprocessing/tests/controllers/CMakeLists.txt
@@ -17,6 +17,6 @@
 # limitations under the License.
 #=============================================================================
 
-#add_midas_mysql_test( RemoteprocessingJobController JobControllerTest.php )
-#add_midas_mysql_test( RemoteprocessingExecutableController ExecutableControllerTest.php )
-add_midas_mysql_test( RemoteprocessingConfigController ConfigControllerTest.php )
+#add_midas_test( RemoteprocessingJobController JobControllerTest.php )
+#add_midas_test( RemoteprocessingExecutableController ExecutableControllerTest.php )
+add_midas_test( RemoteprocessingConfigController ConfigControllerTest.php )
diff --git a/modules/remoteprocessing/tests/models/base/CMakeLists.txt b/modules/remoteprocessing/tests/models/base/CMakeLists.txt
@@ -17,4 +17,4 @@
 # limitations under the License.
 #=============================================================================
 
-add_midas_mysql_test( RemoteprocessingJobModel JobModelTest.php )
+add_midas_test( RemoteprocessingJobModel JobModelTest.php )
diff --git a/modules/remoteprocessing/tests/models/base/JobModelTest.php b/modules/remoteprocessing/tests/models/base/JobModelTest.php
@@ -23,6 +23,12 @@ class JobModelTest extends DatabaseTestCase
   /** set up tests*/
   public function setUp()
     {
+    $db = Zend_Registry::get('dbAdapter');
+    $configDatabase = Zend_Registry::get('configDatabase');
+    if($configDatabase->database->adapter == 'PDO_PGSQL')
+      {
+      $db->query("SELECT setval('remoteprocessing_job_job_id_seq', (SELECT MAX(job_id) FROM remoteprocessing_job)+1);");
+      }
     $this->setupDatabase(array('default')); //core dataset
     $this->setupDatabase(array('default'), 'remoteprocessing'); // module dataset
     $this->enabledModules = array('remoteprocessing');
diff --git a/modules/tracker/database/upgrade/1.0.1.php b/modules/tracker/database/upgrade/1.0.1.php
@@ -1,4 +1,23 @@
 <?php
+/*=========================================================================
+ MIDAS Server
+ Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+ All rights reserved.
+ More information http://www.kitware.com
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0.txt
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+=========================================================================*/
+
 /**
  * 1. Adds a user_id value to a scalar record indicating which user uploaded the scalar
  * 2. Adds a binary "official" flag to a scalar record indicating if it is an official or experimental submission
diff --git a/modules/tracker/database/upgrade/1.0.2.php b/modules/tracker/database/upgrade/1.0.2.php
@@ -1,4 +1,23 @@
 <?php
+/*=========================================================================
+ MIDAS Server
+ Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+ All rights reserved.
+ More information http://www.kitware.com
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0.txt
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+=========================================================================*/
+
 /**
  * Adds revision URL as a configuration parameter on producers
  */
diff --git a/modules/tracker/database/upgrade/1.0.3.php b/modules/tracker/database/upgrade/1.0.3.php
@@ -1,4 +1,23 @@
 <?php
+/*=========================================================================
+ MIDAS Server
+ Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+ All rights reserved.
+ More information http://www.kitware.com
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0.txt
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+=========================================================================*/
+
 /**
  * Adds build results link
  */
diff --git a/modules/tracker/database/upgrade/1.0.4.php b/modules/tracker/database/upgrade/1.0.4.php
@@ -1,4 +1,23 @@
 <?php
+/*=========================================================================
+ MIDAS Server
+ Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+ All rights reserved.
+ More information http://www.kitware.com
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0.txt
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+=========================================================================*/
+
 /**
  * Adds branch name to scalar submission table, and adds an index for it.
  */
diff --git a/modules/validation/database/upgrade/1.0.1.php b/modules/validation/database/upgrade/1.0.1.php
@@ -0,0 +1,39 @@
+<?php
+/*=========================================================================
+ MIDAS Server
+ Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+ All rights reserved.
+ More information http://www.kitware.com
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0.txt
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+=========================================================================*/
+
+class Validation_Upgrade_1_0_1 extends MIDASUpgrade
+  {
+  public function preUpgrade()
+    {
+    }
+
+  public function mysql()
+    {
+    }
+
+  public function pgsql()
+    {
+    $this->db->query("ALTER TABLE validation_dashboard ALTER COLUMN owner_id SET DEFAULT 0;");
+    }
+
+  public function postUpgrade()
+    {
+    }
+  }
diff --git a/modules/validation/tests/controllers/ApiComponentControllerTest.php b/modules/validation/tests/controllers/ApiComponentControllerTest.php
@@ -24,6 +24,15 @@ class ApiControllerTest extends ControllerTestCase
   /** set up tests */
   public function setUp()
     {
+    $db = Zend_Registry::get('dbAdapter');
+    $configDatabase = Zend_Registry::get('configDatabase');
+    if($configDatabase->database->adapter == 'PDO_PGSQL')
+      {
+      $db->query("SELECT setval('validation_dashboard_dashboard_id_seq', (SELECT MAX(dashboard_id) FROM validation_dashboard)+1);");
+      $db->query("SELECT setval('validation_dashboard2folder_dashboard2folder_id_seq', (SELECT MAX(dashboard2folder_id) FROM validation_dashboard2folder)+1);");
+      $db->query("SELECT setval('validation_dashboard2scalarresult_dashboard2scalarresult_id_seq', (SELECT MAX(dashboard2scalarresult_id) FROM  validation_dashboard2scalarresult)+1);");
+      $db->query("SELECT setval('validation_scalarresult_scalarresult_id_seq', (SELECT MAX(scalarresult_id) FROM validation_scalarresult)+1);");
+      }
     $this->setupDatabase(array('default')); //core dataset
     $this->setupDatabase(array('default'), 'validation'); // module dataset
     $this->enabledModules = array('api', 'validation');
diff --git a/modules/validation/tests/controllers/CMakeLists.txt b/modules/validation/tests/controllers/CMakeLists.txt
@@ -17,7 +17,5 @@
 # limitations under the License.
 #=============================================================================
 
-add_midas_mysql_test( ValidationIndexController IndexControllerTest.php )
-add_midas_mysql_test(
-  ValidationApiComponentController
-  ApiComponentControllerTest.php )
+add_midas_test( ValidationIndexController IndexControllerTest.php )
+add_midas_test( ValidationApiComponentController ApiComponentControllerTest.php )
diff --git a/modules/validation/tests/models/base/CMakeLists.txt b/modules/validation/tests/models/base/CMakeLists.txt
@@ -17,5 +17,5 @@
 # limitations under the License.
 #=============================================================================
 
-add_midas_mysql_test( ValidationDashboardModel DashboardModelTest.php )
-add_midas_mysql_test( ValidationScalarResultModel ScalarResultModelTest.php )
+add_midas_test( ValidationDashboardModel DashboardModelTest.php )
+add_midas_test( ValidationScalarResultModel ScalarResultModelTest.php )
diff --git a/modules/validation/tests/models/base/DashboardModelTest.php b/modules/validation/tests/models/base/DashboardModelTest.php
@@ -24,6 +24,15 @@ class DashboardModelTest extends DatabaseTestCase
   /** set up tests*/
   public function setUp()
     {
+    $db = Zend_Registry::get('dbAdapter');
+    $configDatabase = Zend_Registry::get('configDatabase');
+    if($configDatabase->database->adapter == 'PDO_PGSQL')
+      {
+      $db->query("SELECT setval('validation_dashboard_dashboard_id_seq', (SELECT MAX(dashboard_id) FROM validation_dashboard)+1);");
+      $db->query("SELECT setval('validation_dashboard2folder_dashboard2folder_id_seq', (SELECT MAX(dashboard2folder_id) FROM validation_dashboard2folder)+1);");
+      $db->query("SELECT setval('validation_dashboard2scalarresult_dashboard2scalarresult_id_seq', (SELECT MAX(dashboard2scalarresult_id) FROM  validation_dashboard2scalarresult)+1);");
+      $db->query("SELECT setval('validation_scalarresult_scalarresult_id_seq', (SELECT MAX(scalarresult_id) FROM validation_scalarresult)+1);");
+      }
     $this->setupDatabase(array('default')); //core dataset
     $this->setupDatabase(array('default'), 'validation'); // module dataset
     $this->enabledModules = array('validation');
diff --git a/modules/validation/tests/models/base/ScalarResultModelTest.php b/modules/validation/tests/models/base/ScalarResultModelTest.php
@@ -24,6 +24,15 @@ class ScalarResultModelTest extends DatabaseTestCase
   /** set up tests*/
   public function setUp()
     {
+    $db = Zend_Registry::get('dbAdapter');
+    $configDatabase = Zend_Registry::get('configDatabase');
+    if($configDatabase->database->adapter == 'PDO_PGSQL')
+      {
+      $db->query("SELECT setval('validation_dashboard_dashboard_id_seq', (SELECT MAX(dashboard_id) FROM validation_dashboard)+1);");
+      $db->query("SELECT setval('validation_dashboard2folder_dashboard2folder_id_seq', (SELECT MAX(dashboard2folder_id) FROM validation_dashboard2folder)+1);");
+      $db->query("SELECT setval('validation_dashboard2scalarresult_dashboard2scalarresult_id_seq', (SELECT MAX(dashboard2scalarresult_id) FROM  validation_dashboard2scalarresult)+1);");
+      $db->query("SELECT setval('validation_scalarresult_scalarresult_id_seq', (SELECT MAX(scalarresult_id) FROM validation_scalarresult)+1);");
+      }
     $this->setupDatabase(array('default')); //core dataset
     $this->setupDatabase(array('default'), 'validation'); // module dataset
     $this->enabledModules = array('validation');

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@ public function preUpgrade()`
`26`	`26`
`27`	`27`	`public function mysql()`
`28`	`28`	`{`
`29`		`- $sql = "ALTER TABLE remoteprocessing_job ADD creator_id bigint(20)";`
`30`		`- $this->db->query($sql);`
	`29`	`+ $this->db->query("ALTER TABLE remoteprocessing_job ADD COLUMN creator_id bigint(20);");`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`public function pgsql()`
`34`	`33`	`{`
	`34`	`+ $this->db->query("ALTER TABLE remoteprocessing_job ADD COLUMN creator_id bigint;");`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function postUpgrade()`