[Cs-project-svn_notify] SF.net SVN: cs-project: [646] trunk

[<cra...@us...>]

Revision: 646
          http://cs-project.svn.sourceforge.net/cs-project/?rev=646&view=rev
Author:   crazedsanity
Date:     2007-11-20 11:02:33 -0800 (Tue, 20 Nov 2007)

Log Message:
-----------
Remove changes & upgrades that require the contact_id in contact_email_table to be 
deferrable + initially deferred (fixed in the code).

Modified Paths:
--------------
    trunk/docs/schema/cs_project.schema.sql
    trunk/docs/sql/setup/03__indexes_etc.sql

Removed Paths:
-------------
    trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql
    trunk/upgrade/upgradeTo1.1.0-BETA14.php

Modified: trunk/docs/schema/cs_project.schema.sql
===================================================================
--- trunk/docs/schema/cs_project.schema.sql	2007-11-20 18:58:07 UTC (rev 645)
+++ trunk/docs/schema/cs_project.schema.sql	2007-11-20 19:02:33 UTC (rev 646)
@@ -2004,8 +2004,7 @@
 --
 
 ALTER TABLE ONLY contact_email_table
-    ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id)
-	DEFERRABLE INITIALLY DEFERRED;
+    ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id);
 
 
 --

Modified: trunk/docs/sql/setup/03__indexes_etc.sql
===================================================================
--- trunk/docs/sql/setup/03__indexes_etc.sql	2007-11-20 18:58:07 UTC (rev 645)
+++ trunk/docs/sql/setup/03__indexes_etc.sql	2007-11-20 19:02:33 UTC (rev 646)
@@ -466,8 +466,7 @@
 --
 
 ALTER TABLE ONLY contact_email_table
-    ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id)
-	DEFERRABLE INITIALLY DEFERRED;
+    ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id);
 
 
 --

Deleted: trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql
===================================================================
--- trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql	2007-11-20 18:58:07 UTC (rev 645)
+++ trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql	2007-11-20 19:02:33 UTC (rev 646)
@@ -1,12 +0,0 @@
---
--- SVN INFORMATION:::
---
--- SVN Signature::::::: $Id$
--- Last Committted::::: $Date$
--- Last Committed Path: $HeadURL$
---
-
-ALTER TABLE contact_email_table DROP CONSTRAINT "contact_email_table_contact_id_fkey";
-ALTER TABLE ONLY contact_email_table
-	ADD CONSTRAINT contact_email_table_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES contact_table(contact_id)
-	DEFERRABLE INITIALLY DEFERRED;

Deleted: trunk/upgrade/upgradeTo1.1.0-BETA14.php
===================================================================
--- trunk/upgrade/upgradeTo1.1.0-BETA14.php	2007-11-20 18:58:07 UTC (rev 645)
+++ trunk/upgrade/upgradeTo1.1.0-BETA14.php	2007-11-20 19:02:33 UTC (rev 646)
@@ -1,55 +0,0 @@
-<?php
-/*
- * Created on Oct 29, 2007
- */
-
-
-class upgrade_to_1_1_0_BETA13 extends dbAbstract {
-	
-	private $logsObj;
-	
-	//=========================================================================
-	public function __construct(cs_phpDB &$db) {
-		if(!$db->is_connected()) {
-			throw new exception(__METHOD__ .": database is not connected");
-		}
-		$this->db = $db;
-		
-		$this->logsObj = new logsClass($this->db, 'Upgrade');
-		
-		$this->gfObj = new cs_globalFunctions;
-		$this->gfObj->debugPrintOpt = DEBUGPRINTOPT;
-	}//end __construct()
-	//=========================================================================
-	
-	
-	
-	//=========================================================================
-	public function run_upgrade() {
-		
-		
-		$this->db->beginTrans(__METHOD__);
-		
-		$this->run_schema_changes();
-		
-		$this->db->commitTrans(__METHOD__);
-		
-	}//end run_upgrade()
-	//=========================================================================
-	
-	
-	
-	//=========================================================================
-	private function run_schema_changes() {
-		
-		$this->gfObj->debug_print(__METHOD__ .": running SQL file...");
-		$this->run_sql_file(dirname(__FILE__) .'/../docs/sql/upgrades/upgradeTo1.1.0-BETA14.sql');
-		
-		$details = "Executed SQL file, '". $this->lastSQLFile ."'.  Encoded contents::: ". 
-			base64_encode($this->fsObj->read($this->lastSQLFile));
-		$this->logsObj->log_by_class($details, 'system');
-	}//end run_schema_changes()
-	//=========================================================================
-}
-
-?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.