[Greater-commits] r3751 - branches/3.0.0-usf/GREAT-ER-DB/tools

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-29 11:28:57 +0200 (Fri, 29 Jul 2011)
New Revision: 3751

Modified:
   branches/3.0.0-usf/GREAT-ER-DB/tools/create_usf_tables.sql
Log:
Add usf table changes


Modified: branches/3.0.0-usf/GREAT-ER-DB/tools/create_usf_tables.sql
===================================================================
--- branches/3.0.0-usf/GREAT-ER-DB/tools/create_usf_tables.sql	2011-07-29 08:47:21 UTC (rev 3750)
+++ branches/3.0.0-usf/GREAT-ER-DB/tools/create_usf_tables.sql	2011-07-29 09:28:57 UTC (rev 3751)
@@ -410,40 +410,6 @@
 );
 
 --
--- TOC Entry ID 44 (OID 4743822)
---
--- Name: disch_class_tab Type: TABLE Owner: greater
---
-
-CREATE TABLE "disch_class_tab" (
-	"disch_class_id" numeric(26,0) NOT NULL,
-	"name" character varying(255),
-	"wwtp_type" character varying(255),
-	"capacity" character varying(40),
-	"aer_type" character varying(40),
-	"h_prim" character varying(40),
-	"v_overflow_prim" character varying(40),
-	"r_ss_prim_max" character varying(40),
-	"h_sec" character varying(40),
-	"v_overflow_sec" character varying(40),
-	"r_ss_sec_max" character varying(40),
-	"ss_ml" character varying(40),
-	"recycle" character varying(40),
-	"a_biomass" character varying(40),
-	"h_act_sludge" character varying(40),
-	"b_x" character varying(40),
-	"y" character varying(40),
-	"do_" character varying(40),
-	"f_aerobic" character varying(40),
-	"f_anoxic" character varying(40),
-	"f_anaerobic" character varying(40),
-	"eps_n" character varying(40),
-	"eps_dn" character varying(40),
-	"remark" character varying(2000),
-	Constraint "disch_class_u1_idx" Primary Key ("disch_class_id")
-);
-
---
 -- TOC Entry ID 45 (OID 4743829)
 --
 -- Name: stretch_class_tab Type: TABLE Owner: greater
@@ -571,6 +537,11 @@
 	"l" character varying(40) NOT NULL,
 	"d_val" character varying(255) NOT NULL,
 	"d_dist" character varying(11),
+    "vol_val" character varying(255),
+    "vol_dist"character varying(11),
+    "baseflow"character varying(40),
+    "agriculture" character varying(49),
+    "natural_soil" character varying(40),
 	Constraint "stretch_u1_idx" Primary Key ("catch_id", "stretch_id")
 );
 
@@ -584,17 +555,21 @@
 	"disch_id" numeric(26,0) NOT NULL,
 	"stretch_id" numeric(26,0) NOT NULL,
 	"catch_id" numeric(26,0) NOT NULL,
-	"disch_class_id" numeric(26,0) NOT NULL,
 	"name" character varying(255),
 	"pop" character varying(40),
-	"dwf" character varying(40),
+	"paved_surface" character varying(40),
+	"roof" character varying(40),
+	"roof_indust" character varying(40),
+	"street" character varying(40),
+	"srt" character varying(40),
 	"flow_val" character varying(255),
 	"flow_dist" character varying(11),
-	"flow_dom" character varying(40),
-	"flow_nondom" character varying(40),
-	"flow_runoff" character varying(40),
-	"treated" character varying(40),
-	"r_wwtp" character varying(40),
+	"mlss" character varying(40),
+	"vol_vk" character varying(40),
+	"vol_bb" character varying(40),
+	"f_mix" character varying(40),
+	"type" character varying(40),
+	"vol_sewer" character varying(40),
 	"remark" character varying(2000),
 	Constraint "disch_u1_idx" Primary Key ("catch_id", "disch_id")
 );
@@ -616,8 +591,12 @@
 	"status" character varying(30) NOT NULL,
 	"privs" numeric(1,0) NOT NULL,
 	"consumption" character varying(40),
+	"surface_potential" character varying(40),
+	"roof_runoff" character varying(40),
+	"street_runoff" character varying(40),
 	"flux_nondom" character varying(40),
 	"flux_runoff" character varying(40),
+	"wwtp_removal" character varying(40),
 	"remark" character varying(2000),
 	Constraint "market_u1_idx" Primary Key ("catch_id", "disch_id", "market_id")
 );
@@ -782,7 +761,6 @@
 	"disch_id" numeric(26,0) NOT NULL,
 	"stretch_id" numeric(26,0) NOT NULL,
 	"catch_id" numeric(26,0) NOT NULL,
-	"disch_class_id" numeric(26,0) NOT NULL,
 	"name" character varying(255) NOT NULL,
 	"user_id" character varying(30) NOT NULL,
 	"cre_date" date NOT NULL,
@@ -790,14 +768,13 @@
 	"status" character varying(30) NOT NULL,
 	"privs" numeric(1,0) NOT NULL,
 	"pop" character varying(40),
-	"dwf" character varying(40),
+	"paved_surface" character varying(40),
+	"roof" character varying(40),
+	"roof_indust" character varying(40),
+	"street" character varying(40),
 	"flow_val" character varying(255),
 	"flow_dist" character varying(11),
-	"flow_dom" character varying(40),
-	"flow_nondom" character varying(40),
-	"flow_runoff" character varying(40),
-	"treated" character varying(40),
-	"r_wwtp" character varying(40),
+	"f_mix" character varying(40),
 	"remark" character varying(2000),
 	Constraint "sess_disch_u1_idx" Primary Key ("catch_id", "disch_id", "sess_disch_id")
 );