[basedb-cvs] basedb/exec/migration_tools dbmigrate.php,1.8,1.9

[<tr...@us...>]

Update of /cvsroot/basedb/basedb/exec/migration_tools
In directory usw-pr-cvs1:/tmp/cvs-serv22206

Modified Files:
	dbmigrate.php 
Log Message:
Added schema versions 1.1.1 and 1.1.2

Index: dbmigrate.php
===================================================================
RCS file: /cvsroot/basedb/basedb/exec/migration_tools/dbmigrate.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dbmigrate.php	30 Aug 2002 10:18:37 -0000	1.8
--- dbmigrate.php	7 Sep 2002 11:32:02 -0000	1.9
***************
*** 39,44 ****
  	// Add new versions here, and further down add functions like the
  	// existing ones.
! 	$versions = array("1.0.1", "1.0.1a", "1.0.1b", "1.0.2", "1.1.1");
! 	$lastVersion = "1.1.1";
  
  	require_once("../getconfig2.inc.php");
--- 39,45 ----
  	// Add new versions here, and further down add functions like the
  	// existing ones.
! 	$versions = array("1.0.1", "1.0.1a", "1.0.1b", "1.0.2", "1.1.1",
! 		"1.1.2");
! 	$lastVersion = "1.1.2";
  
  	require_once("../getconfig2.inc.php");
***************
*** 48,52 ****
  
  	// Open database connection
! 	$curDb = new luDatabase($config["dbHost"], $config["dbUser"],
  		$config["dbPassword"], $config["dbDatabase"]);
  	unset($config["dbPassword"]);
--- 49,53 ----
  
  	// Open database connection
! 	$curDb = new BaseDatabase($config["dbHost"], $config["dbUser"],
  		$config["dbPassword"], $config["dbDatabase"]);
  	unset($config["dbPassword"]);
***************
*** 352,355 ****
--- 353,412 ----
  		return "";
  	}
+ 
+ 
+ 	function migrateFrom_1_1_1(&$version)
+ 	{
+ 		$query = "ALTER TABLE HybridizedLabeled ".
+ 			"CHANGE position position tinyint(4) NOT NULL default '0'";
+ 		if(!myquery($query))
+ 			return "Failed to remove auto_increment from HybridizedLabeled";
+ 		
+ 		$query = "ALTER TABLE RawBioAssayData ".
+ 			"CHANGE position position mediumint(9) NOT NULL default '0'";
+ 		if(!myquery($query))
+ 			return "Failed to remove auto_increment from RawBioAssayData";
+ 		
+ 		$query = "ALTER TABLE TemplateBioAssayData ".
+ 			"CHANGE position position mediumint(9) NOT NULL default '0'";
+ 		if(!myquery($query))
+ 			return "Failed to remove auto_increment from TemplateBioAssayData";
+ 		
+ 		$query = "ALTER TABLE ImageAcquisition 
+ 			ADD spotImage int(11) default NULL,
+ 			ADD spotXOffset int(11) NOT NULL default '0',
+ 			ADD spotYOffset int(11) NOT NULL default '0',
+ 			ADD spotScale float NOT NULL default '0'";
+ 		if(!myquery($query))
+ 			return "Failed to add spot image columns to ImageAcquisition";
+ 
+ 		$query = "CREATE TABLE TemplateGeneListTemp (
+ 			  molecule int(11) NOT NULL default '0',
+ 			  score int(11) NOT NULL auto_increment,
+ 			  PRIMARY KEY  (score)
+ 			) TYPE=MyISAM";
+ 		if(!myquery($query))
+ 			return "Failed to create table TemplateGeneListTemp";
+ 
+ 		$query = "UPDATE SchemaVersion
+ 			SET baseVersion = '1.1', schemaVersion = '1.1.2',
+ 			lastChanged = NOW()";
+ 		if(!myquery($query) || mysql_affected_rows() < 1)
+ 			return "Can't update SchemaVersion table";
+ 
+ 		$version = "1.1.2";
+ 		return "";
+ 	}
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
  /*	function migrateFrom_1_1_1(&$version)