X-Git-Url: http://jaekl.net/gitweb/?p=cfb.git;a=blobdiff_plain;f=prod%2Fnet%2Fjaekl%2Fcfb%2Fdb%2FCfbSchema.java;h=84f858db4db6572ab20b2b84246b9537962f68eb;hp=49adde6c5a224c6cee2dad0952e82af671dc29e2;hb=2769cf82ccae57ee3716aecc9bd694be1f115d92;hpb=e39cda22382d19e6b794dd73e1d1f5ed355cc6a6

diff --git a/prod/net/jaekl/cfb/db/CfbSchema.java b/prod/net/jaekl/cfb/db/CfbSchema.java
index 49adde6..84f858d 100644
--- a/prod/net/jaekl/cfb/db/CfbSchema.java
+++ b/prod/net/jaekl/cfb/db/CfbSchema.java
@@ -23,51 +23,62 @@ public class CfbSchema extends Schema {
 	public static final Sequence FOUND_SEQ    = new Sequence("FOUND_SEQ");
 	public static final Sequence LOC_SEQ      = new Sequence("LOC_SEQ");
 	public static final Sequence RUN_SEQ      = new Sequence("RUN_SEQ");
+	public static final Sequence VARIABLE_SEQ = new Sequence("VARIABLE_SEQ");
 	
-	public static final Column BUGID       = new Column("BUGID",       INTEGER,      -1, NOT_NULL);
-	public static final Column CATEGORY    = new Column("CATEGORY",    VARCHAR,      80, NOT_NULL);
-	public static final Column CATEGORYID  = new Column("CATEGORYID",  INTEGER,      -1, NOT_NULL);
-	public static final Column CLASSNAME   = new Column("CLASSNAME",   VARCHAR,     256, NOT_NULL);
-	public static final Column ENDLINE     = new Column("ENDLINE",     INTEGER,      -1, NULL);
-	public static final Column ENDTIME     = new Column("ENDTIME",     TIMESTAMPTZ,  -1, NOT_NULL);
-	public static final Column FIRSTLOCID  = new Column("FIRSTLOCID",  INTEGER,      -1, NOT_NULL);
-	public static final Column FOUNDID     = new Column("FOUNDID",     INTEGER,      -1, NOT_NULL);
-	public static final Column LOCID       = new Column("LOCID",       INTEGER,      -1, NOT_NULL);
-	public static final Column METHODNAME  = new Column("METHODNAME",  VARCHAR,     256, NULL);
-	public static final Column RUNID       = new Column("RUNID",       INTEGER,      -1, NOT_NULL);
-	public static final Column SECONDLOCID = new Column("SECONDLOCID", INTEGER,      -1, NULL);
-	public static final Column STARTLINE   = new Column("STARTLINE",   INTEGER,      -1, NULL);
-	public static final Column STARTTIME   = new Column("STARTTIME",   TIMESTAMPTZ,  -1, NOT_NULL);
-	public static final Column THIRDLOCID  = new Column("THIRDLOCID",  INTEGER,      -1, NULL); 
-	public static final Column TYPE        = new Column("TYPE",        VARCHAR,      80, NOT_NULL );
-	public static final Column VERSION     = new Column("VERSION",     VARCHAR,      32, NULL);
+	public static final Column BUGID        = new Column("BUGID",       INTEGER,      -1, NOT_NULL);
+	public static final Column CATEGORY     = new Column("CATEGORY",    VARCHAR,      80, NOT_NULL);
+	public static final Column CATEGORYID   = new Column("CATEGORYID",  INTEGER,      -1, NOT_NULL);
+	public static final Column CLASSNAME    = new Column("CLASSNAME",   VARCHAR,     256, NOT_NULL);
+	public static final Column ENDLINE      = new Column("ENDLINE",     INTEGER,      -1, NULL);
+	public static final Column ENDTIME      = new Column("ENDTIME",     TIMESTAMPTZ,  -1, NOT_NULL);
+	public static final Column FIRSTLOCID   = new Column("FIRSTLOCID",  INTEGER,      -1, NOT_NULL);
+	public static final Column FOUNDID      = new Column("FOUNDID",     INTEGER,      -1, NOT_NULL);
+	public static final Column LOCID        = new Column("LOCID",       INTEGER,      -1, NOT_NULL);
+	public static final Column METHODNAME   = new Column("METHODNAME",  VARCHAR,     256, NULL);
+	public static final Column METHODROLE   = new Column("METHODROLE",  VARCHAR,      80, NULL);
+	public static final Column NAME         = new Column("NAME",        VARCHAR,     256, NOT_NULL);
+	public static final Column PROJNAME     = new Column("PROJNAME",    VARCHAR,      80, NOT_NULL);
+	public static final Column RUNID        = new Column("RUNID",       INTEGER,      -1, NOT_NULL);
+	public static final Column SECONDLOCID  = new Column("SECONDLOCID", INTEGER,      -1, NULL);
+	public static final Column STARTLINE    = new Column("STARTLINE",   INTEGER,      -1, NULL);
+	public static final Column STARTTIME    = new Column("STARTTIME",   TIMESTAMPTZ,  -1, NOT_NULL);
+	public static final Column THIRDLOCID   = new Column("THIRDLOCID",  INTEGER,      -1, NULL); 
+	public static final Column TYPE         = new Column("TYPE",        VARCHAR,      80, NOT_NULL);
+	public static final Column VARID_FK     = new Column("VARID",       INTEGER,      -1, NULL);		// foreign key
+	public static final Column VARID_PK     = new Column("VARID",       INTEGER,      -1, NOT_NULL);	// primary key
+	public static final Column VARROLE      = new Column("VARROLE",     VARCHAR,      80, NOT_NULL);
+	public static final Column VERSION      = new Column("VERSION",     VARCHAR,      32, NULL);
 	
 	private static final Column[] BUGS_COLS       = { BUGID, TYPE };
 	private static final Column[] CATEGORIES_COLS = { CATEGORYID, CATEGORY };
-	private static final Column[] FOUND_COLS      = { FOUNDID, BUGID, CATEGORYID, FIRSTLOCID, SECONDLOCID, THIRDLOCID };
-	private static final Column[] LOCATIONS_COLS  = { LOCID, CLASSNAME, METHODNAME, STARTLINE, ENDLINE };
-	private static final Column[] RUNS_COLS       = { RUNID, VERSION, STARTTIME, ENDTIME };
+	private static final Column[] FOUND_COLS      = { FOUNDID, RUNID, BUGID, CATEGORYID, FIRSTLOCID, SECONDLOCID, THIRDLOCID, VARID_FK };
+	private static final Column[] LOCATIONS_COLS  = { LOCID, CLASSNAME, METHODNAME, METHODROLE, STARTLINE, ENDLINE };
+	private static final Column[] RUNS_COLS       = { RUNID, PROJNAME, VERSION, STARTTIME, ENDTIME };
+	private static final Column[] VARIABLES_COLS  = { VARID_PK, NAME, VARROLE };
 
 	public static final Table BUGS       = new Table("BUGS",       BUGS_COLS);
 	public static final Table CATEGORIES = new Table("CATEGORIES", CATEGORIES_COLS);
 	public static final Table FOUND      = new Table("FOUND",      FOUND_COLS);
 	public static final Table LOCATIONS  = new Table("LOCATIONS",  LOCATIONS_COLS);
 	public static final Table RUNS       = new Table("RUNS",       RUNS_COLS);
+	public static final Table VARIABLES  = new Table("VARIABLES",  VARIABLES_COLS);
 	
-	private static final Sequence[] SEQUENCES = {
+	static final Sequence[] SEQUENCES = {
 					BUG_SEQ,
 					CATEGORY_SEQ,
 					FOUND_SEQ,
 					LOC_SEQ,
-					RUN_SEQ
+					RUN_SEQ,
+					VARIABLE_SEQ
 				};
 	
-	private static final Table[] TABLES = { 
+	static final Table[] TABLES = { 
 					BUGS,
 					CATEGORIES,
 					FOUND,
 					LOCATIONS,
-					RUNS
+					RUNS,
+					VARIABLES
 				};
 	
 	public CfbSchema(DbDriver driver) {