[basedb-cvs] basedb base_pg.sql,1.5,1.6

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

Update of /cvsroot/basedb/basedb
In directory usw-pr-cvs1:/tmp/cvs-serv4515

Modified Files:
	base_pg.sql 
Log Message:
Removed TemplateGeneListTemp, added function ISNULL

Index: base_pg.sql
===================================================================
RCS file: /cvsroot/basedb/basedb/base_pg.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** base_pg.sql	10 Sep 2002 10:58:47 -0000	1.5
--- base_pg.sql	11 Sep 2002 10:37:30 -0000	1.6
***************
*** 69,73 ****
  	"arrayType" integer DEFAULT '0' NOT NULL,
  	"blockNum" smallint DEFAULT '0' NOT NULL,
! 	"xOrigin2" integer DEFAULT '0' NOT NULL,
  	"yOrigin" integer DEFAULT '0' NOT NULL,
  	"featureDiameter" smallint DEFAULT '0' NOT NULL,
--- 69,73 ----
  	"arrayType" integer DEFAULT '0' NOT NULL,
  	"blockNum" smallint DEFAULT '0' NOT NULL,
! 	"xOrigin" integer DEFAULT '0' NOT NULL,
  	"yOrigin" integer DEFAULT '0' NOT NULL,
  	"featureDiameter" smallint DEFAULT '0' NOT NULL,
***************
*** 1421,1430 ****
  );
  
- CREATE TABLE TemplateGeneListTemp (
- 	molecule integer DEFAULT '0' NOT NULL,
- 	score integer DEFAULT nextval('genelisttemp_score_seq'::text) NOT NULL,
- 	Constraint TemplateGeneListTemp_pkey Primary Key (molecule, score)
- );
- 
  --
  -- TOC Entry ID 86 (OID 1099899)
--- 1421,1424 ----
***************
*** 2251,2252 ****
--- 2245,2248 ----
  SELECT setval ('sampletissue_id_seq', 2, true);
  
+ 
+ CREATE FUNCTION "ifnull"(smallint, integer) RETURNS smallint AS 'select CASE WHEN $1 IS NULL THEN $2 ELSE $1 END' LANGUAGE 'sql';