Small tweaks to some SQL scripts

Jamie Snape · Jamie Snape · commit 5dee53682d09 · 2014-06-19T17:37:40.000-04:00
diff --git a/core/database/mysql/3.0.1.sql b/core/database/mysql/3.0.1.sql
@@ -404,4 +404,4 @@ CREATE TABLE IF NOT EXISTS `feedpolicyuser` (
   `policy` tinyint(4) NOT NULL,
   `date` timestamp NULL DEFAULT CURRENT_TIMESTAMP(),
   UNIQUE KEY `feed_id` (`feed_id`,`user_id`)
-)  DEFAULT CHARSET=utf8;
+)  DEFAULT CHARSET=utf8;
diff --git a/core/database/pgsql/3.0.1.sql b/core/database/pgsql/3.0.1.sql
@@ -380,4 +380,4 @@ CREATE TABLE  feedpolicyuser (
   user_id bigint NOT NULL,
   policy smallint NOT NULL,
   date TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-) ;
+) ;
diff --git a/core/database/pgsql/3.1.0.sql b/core/database/pgsql/3.1.0.sql
@@ -442,5 +442,3 @@ CREATE TABLE user2group (
     user_id bigint NOT NULL,
     group_id bigint NOT NULL
 );
-
-
diff --git a/core/database/upgrade/3.2.10.php b/core/database/upgrade/3.2.10.php
@@ -29,7 +29,7 @@ public function preUpgrade()
 
   public function mysql()
     {
-    $this->db->query("CREATE TABLE `newuserinvitation` (
+    $this->db->query("CREATE TABLE IF NOT EXISTS `newuserinvitation` (
       `newuserinvitation_id` bigint(20) NOT NULL AUTO_INCREMENT,
       `auth_key` varchar(255) NOT NULL,
       `email` varchar(255) NOT NULL,
@@ -39,7 +39,7 @@ public function mysql()
       `date_creation` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
       PRIMARY KEY (`newuserinvitation_id`)
       )");
-    $this->db->query("CREATE TABLE `pendinguser` (
+    $this->db->query("CREATE TABLE IF NOT EXISTS `pendinguser` (
       `pendinguser_id` bigint(20) NOT NULL AUTO_INCREMENT,
       `auth_key` varchar(255) NOT NULL,
       `email` varchar(255) NOT NULL,
diff --git a/core/database/upgrade/3.2.12.php b/core/database/upgrade/3.2.12.php
@@ -33,7 +33,7 @@ public function mysql()
     $this->db->query("ALTER TABLE `user` ADD COLUMN `salt` varchar(64) NOT NULL default ''");
     $this->db->query("ALTER TABLE `pendinguser` ADD COLUMN `salt` varchar(64) NOT NULL default ''");
 
-    $this->db->query("CREATE TABLE `password` (
+    $this->db->query("CREATE TABLE IF NOT EXISTS `password` (
                         `hash` varchar(128) NOT NULL,
                         PRIMARY KEY (`hash`)
                      ) ENGINE=InnoDB DEFAULT CHARSET=utf8");
diff --git a/core/database/upgrade/3.2.2.php b/core/database/upgrade/3.2.2.php
@@ -149,7 +149,7 @@ public function preUpgrade()
   public function mysql()
     {
     // Create the license table
-    $this->db->query("CREATE TABLE `license` (
+    $this->db->query("CREATE TABLE IF NOT EXISTS `license` (
       `license_id` bigint(20) NOT NULL AUTO_INCREMENT,
       `name` TEXT NOT NULL,
       `fulltext` TEXT NOT NULL,
diff --git a/core/database/upgrade/3.2.4.php b/core/database/upgrade/3.2.4.php
@@ -30,7 +30,7 @@ public function preUpgrade()
 
   public function mysql()
     {
-    $this->db->query("CREATE TABLE `activedownload` (
+    $this->db->query("CREATE TABLE IF NOT EXISTS `activedownload` (
       `activedownload_id` bigint(20) NOT NULL AUTO_INCREMENT,
       `ip` varchar(100) NOT NULL DEFAULT '',
       `date_creation` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
diff --git a/core/database/upgrade/3.2.7.php b/core/database/upgrade/3.2.7.php
@@ -29,7 +29,7 @@ public function preUpgrade()
 
   public function mysql()
     {
-    $this->db->query("CREATE TABLE `progress` (
+    $this->db->query("CREATE TABLE IF NOT EXISTS `progress` (
       `progress_id` bigint(20) NOT NULL AUTO_INCREMENT,
       `message` TEXT NOT NULL,
       `current` bigint(20) NOT NULL,
diff --git a/modules/batchmake/database/mysql/0.1.0.sql b/modules/batchmake/database/mysql/0.1.0.sql
@@ -28,4 +28,4 @@ CREATE TABLE IF NOT EXISTS condor_job (
     error_filename text NOT NULL,
     log_filename text NOT NULL,
     PRIMARY KEY (condor_job_id)
-)   DEFAULT CHARSET=utf8;
+)   DEFAULT CHARSET=utf8;
diff --git a/modules/batchmake/database/pgsql/0.1.0.sql b/modules/batchmake/database/pgsql/0.1.0.sql
@@ -24,4 +24,4 @@ CREATE TABLE condor_job (
     output_filename text NOT NULL,
     error_filename text NOT NULL,
     log_filename text NOT NULL
-);
+);
diff --git a/modules/communityagreement/database/mysql/1.0.0.sql b/modules/communityagreement/database/mysql/1.0.0.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS communityagreement_agreement (
   `agreement` text NOT NULL,
   PRIMARY KEY (`agreement_id`),
   KEY `community_id` (`community_id`)
-) DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
diff --git a/modules/communityagreement/database/pgsql/1.0.0.sql b/modules/communityagreement/database/pgsql/1.0.0.sql
@@ -6,4 +6,4 @@ CREATE TABLE communityagreement_agreement (
   agreement_id serial PRIMARY KEY,
   community_id bigint NOT NULL,
   agreement text NOT NULL
-);
+);
diff --git a/modules/dicomserver/database/mysql/1.0.0.sql b/modules/dicomserver/database/mysql/1.0.0.sql
@@ -3,4 +3,3 @@ CREATE TABLE IF NOT EXISTS `dicomserver_registration` (
   `item_id` bigint(20) NOT NULL,
   PRIMARY KEY (`registration_id`)
 )   DEFAULT CHARSET=utf8;
-
diff --git a/modules/example/database/mysql/1.0.0.sql b/modules/example/database/mysql/1.0.0.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS example_wallet (
     user_id bigint(20) NOT NULL,
     dollars bigint(20) NOT NULL,
     PRIMARY KEY (example_wallet_id)
-)   DEFAULT CHARSET=utf8;
+)   DEFAULT CHARSET=utf8;
diff --git a/modules/example/database/pgsql/1.0.0.sql b/modules/example/database/pgsql/1.0.0.sql
@@ -2,4 +2,4 @@ CREATE TABLE example_wallet (
     example_wallet_id serial PRIMARY KEY,
     user_id bigint NOT NULL,
     dollars bigint NOT NULL
-);
+);
diff --git a/modules/ratings/database/pgsql/1.0.0.sql b/modules/ratings/database/pgsql/1.0.0.sql
@@ -2,10 +2,8 @@ CREATE TABLE ratings_item (
   rating_id serial PRIMARY KEY,
   item_id bigint NOT NULL,
   user_id bigint NOT NULL,
-  rating smallint NOT NULL,
-  KEY (`item_id`),
-  KEY (`user_id`)
+  rating smallint NOT NULL
 );
 
 CREATE INDEX ratings_item_item_id ON ratings_item (item_id);
-CREATE INDEX ratings_item_user_id ON ratings_item (user_id);
+CREATE INDEX ratings_item_user_id ON ratings_item (user_id);
diff --git a/modules/remoteprocessing/database/mysql/1.0.0.sql b/modules/remoteprocessing/database/mysql/1.0.0.sql
@@ -18,4 +18,3 @@ CREATE TABLE IF NOT EXISTS `remoteprocessing_job2item` (
   `item_id` bigint(20) NOT NULL,
   `type` tinyint(4) NOT NULL DEFAULT 0
 );
-
diff --git a/modules/scheduler/database/mysql/1.0.0.sql b/modules/scheduler/database/mysql/1.0.0.sql
@@ -78,4 +78,4 @@ CREATE TABLE scheduler_execution_state (
   node_thread_id      INTEGER UNSIGNED NOT NULL,
 
   PRIMARY KEY (execution_id, node_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/modules/tracker/database/pgsql/1.0.0.sql b/modules/tracker/database/pgsql/1.0.0.sql
@@ -45,4 +45,4 @@ CREATE TABLE tracker_threshold_notification (
   action character varying(80) NOT NULL,
   recipient_id bigint NOT NULL
 );
-CREATE INDEX tracker_threshold_notification_trend_id ON tracker_threshold_notification (trend_id);
+CREATE INDEX tracker_threshold_notification_trend_id ON tracker_threshold_notification (trend_id);

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public function preUpgrade()`
`149`	`149`	`public function mysql()`
`150`	`150`	`{`
`151`	`151`	`// Create the license table`
`152`		- $this->db->query("CREATE TABLE `license` (
	`152`	+ $this->db->query("CREATE TABLE IF NOT EXISTS `license` (
`153`	`153`	`license_id` bigint(20) NOT NULL AUTO_INCREMENT,
`154`	`154`	`name` TEXT NOT NULL,
`155`	`155`	`fulltext` TEXT NOT NULL,
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function preUpgrade()`
`30`	`30`
`31`	`31`	`public function mysql()`
`32`	`32`	`{`
`33`		- $this->db->query("CREATE TABLE `activedownload` (
	`33`	+ $this->db->query("CREATE TABLE IF NOT EXISTS `activedownload` (
`34`	`34`	`activedownload_id` bigint(20) NOT NULL AUTO_INCREMENT,
`35`	`35`	`ip` varchar(100) NOT NULL DEFAULT '',
`36`	`36`	`date_creation` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function preUpgrade()`
`29`	`29`
`30`	`30`	`public function mysql()`
`31`	`31`	`{`
`32`		- $this->db->query("CREATE TABLE `progress` (
	`32`	+ $this->db->query("CREATE TABLE IF NOT EXISTS `progress` (
`33`	`33`	`progress_id` bigint(20) NOT NULL AUTO_INCREMENT,
`34`	`34`	`message` TEXT NOT NULL,
`35`	`35`	`current` bigint(20) NOT NULL,