X-Git-Url: http://jaekl.net/gitweb/?a=blobdiff_plain;f=prod%2Fnet%2Fjaekl%2Fcfb%2Fdb%2FCfbSchema.java;h=33c1b9e1c8ceb1baff08b20fa8964c2368175051;hb=598968590bf67cf87d3243878f7ebb2ff8015065;hp=d80be57940a084ebeb81dbe17844f7d5cde4c103;hpb=58107a0cbb49652e7772ce80fb73d2c027590eb1;p=cfb.git

diff --git a/prod/net/jaekl/cfb/db/CfbSchema.java b/prod/net/jaekl/cfb/db/CfbSchema.java
index d80be57..33c1b9e 100644
--- a/prod/net/jaekl/cfb/db/CfbSchema.java
+++ b/prod/net/jaekl/cfb/db/CfbSchema.java
@@ -25,10 +25,19 @@ public class CfbSchema extends Schema {
 	public static final Sequence RUN_SEQ      = new Sequence("RUN_SEQ");
 	
 	public static final String BUGID = "BUGID";
+	public static final String CATEGORY = "CATEGORY";
 	public static final String CATEGORYID = "CATEGORYID";
+	public static final String CLASSNAME = "CLASSNAME";
+	public static final String ENDLINE = "ENDLINE";
+	public static final String FIRSTLOCID = "FIRSTLOCID";
 	public static final String FOUNDID = "FOUNDID";
 	public static final String LOCID = "LOCID";
+	public static final String METHODNAME = "METHODNAME";
 	public static final String RUNID = "RUNID";
+	public static final String SECONDLOCID = "SECONDLOCID";
+	public static final String STARTLINE = "STARTLINE";
+	public static final String THIRDLOCID = "THIRDLOCID";
+	public static final String TYPE = "TYPE";
 	
 	// Define each table as follows:
 	// {
@@ -40,34 +49,35 @@ public class CfbSchema extends Schema {
 					// Description of each possible bug
 					{ "BUG" },
 					{ BUGID, INTEGER, -1, NOT_NULL },
-					{ "TYPE", VARCHAR, 80, NOT_NULL }
+					{ TYPE, VARCHAR, 80, NOT_NULL }, 
+					{ "CATEGORYID", INTEGER, -1, NOT_NULL }
 				};
 	private static final Object[][] CATEGORIES_DEFN = 
 				{
 					// Description of each possible bug category
-					{ "CATEGORY" },
+					{ "CATEGORIES" },
 					{ CATEGORYID, INTEGER, -1, NOT_NULL },
-					{ "CATEGORY", VARCHAR, 80, NOT_NULL }
+					{ CATEGORY, VARCHAR, 80, NOT_NULL }
 				};
 	private static final Object[][] FOUND_DEFN = 
 				{ 
 					// One BugInstance, found during an analysis
 					{ "FOUND" },
 					{ FOUNDID, INTEGER, -1, NOT_NULL },
-					{ "BUGID", INTEGER, -1, NOT_NULL },
-					{ "CATEGORYID", INTEGER, -1, NOT_NULL },
-					{ "FIRSTLOCID", INTEGER, -1, NOT_NULL },
-					{ "SECONDLOCID", INTEGER, -1, NULL },
-					{ "THIRDLOCID", INTEGER, -1, NULL }
+					{ BUGID, INTEGER, -1, NOT_NULL },
+					{ FIRSTLOCID, INTEGER, -1, NOT_NULL },
+					{ SECONDLOCID, INTEGER, -1, NULL },
+					{ THIRDLOCID, INTEGER, -1, NULL }
 				};
 	private static final Object[][] LOCATIONS_DEFN = 
 				{
 					// Location in the source code referenced by a BugInstance
 					{ "LOCATION" },
 					{ LOCID, INTEGER, -1, NOT_NULL },
-					{ "CLASSNAME", VARCHAR, 256, NOT_NULL },
-					{ "STARTLINE", INTEGER, -1, NULL },
-					{ "ENDLINE", INTEGER, -1, NULL }
+					{ CLASSNAME, VARCHAR, 256, NOT_NULL },
+					{ METHODNAME, VARCHAR, 256, NULL },
+					{ STARTLINE, INTEGER, -1, NULL },
+					{ ENDLINE, INTEGER, -1, NULL }
 				};
 	private static final Object[][] RUNS_DEFN = 
 				{
@@ -136,6 +146,7 @@ public class CfbSchema extends Schema {
 		int row = 0;
 		for (BugCategory cat : categories) {
 			long categoryId = m_driver.nextVal(con, CATEGORY_SEQ);
+			cat.setId(categoryId);
 			
 			values[row][0] = Long.valueOf(categoryId);
 			values[row][1] = cat.getCategory();
@@ -155,6 +166,7 @@ public class CfbSchema extends Schema {
 		int row = 0;
 		for (BugPattern bug : patterns) {
 			long bugId = m_driver.nextVal(con, BUG_SEQ);
+			bug.setId(bugId);
 			
 			values[row][0] = Long.valueOf(bugId);
 			values[row][1] = bug.getType();