New tables:

PASSWORDS - holds history of passwords for parties ACCESS_CONTROLS - hold page, item / role information for authorization purposes. Modified tables: ENQUIRIES - meter size removed. Replaced by foreign key to METER_SIZE_CODES. COSTS - includes AICO_CODE and DESCRIPTION for use as cost details for Additional Items. General modifications: Yes/No columns modified to VARCHAR2(3) Modules: Added mip_security.pck. Supports Authentication and Authorization (update of the original POC version) Respository: Created new directory structure to hold persistent data. Currently includes Data/Seed for base table values and Data/Demo to populate various party and relationship tables. git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@2838 248e525c-4dfb-0310-94bc-949c084e9493
2007-11-12 12:07:25 +00:00
parent 7def5bb1af
commit f5e160010b
45 changed files with 541 additions and 58 deletions
--- a/Schema/InstallMIP.cmd
+++ b/Schema/InstallMIP.cmd
@@ -8,8 +8,6 @@ if "%5"=="" goto :usage

 sqlplus /nolog @InstallMIP %1 %2 %3 %4 %5

-InstallSeed %3/%4@%5
-
 goto :done

 :usage
--- a/Schema/InstallMIP.sql
+++ b/Schema/InstallMIP.sql
@@ -6,6 +6,6 @@ grant connect, resource to &3 identified by &4;

 connect &3/&4@&5

-@mip
+@@mip

 exit
--- a/Schema/InstallSeed.cmd
+++ b/Schema/InstallSeed.cmd
@@ -1,69 +0,0 @@
-@echo off
-
-if "%1"=="" goto :usage
-if "%1"=="sys" goto :usage
-if "%1"=="system" goto :usage
-
-sqlplus %1 @disable_constraints
-
-sqlplus %1 @delete_tables
-
-sqlldr %1 control=alty
-
-sqlldr %1 control=caco
-
-sqlldr %1 control=comt
-
-sqlldr %1 control=enrt
-
-sqlldr %1 control=enst
-
-sqlldr %1 control=enty
-
-sqlldr %1 control=fity
-
-sqlldr %1 control=hoty
-
-sqlldr %1 control=mety
-
-sqlldr %1 control=part
-
-sqlldr %1 control=pcmrt
-
-sqlldr %1 control=prt
-
-sqlldr %1 control=prtp
-
-sqlldr %1 control=qurt
-
-sqlldr %1 control=qust
-
-sqlldr %1 control=rety
-
-sqlldr %1 control=rvty
-
-sqlldr %1 control=svcpt
-
-sqlldr %1 control=svcp
-
-sqlldr %1 control=slty
-
-sqlldr %1 control=cnty
-
-sqlldr %1 control=cnor
-
-sqlldr %1 control=slva
-
-sqlldr %1 control=caca
-
-sqlldr %1 control=mesc
-
-sqlplus %1 @enable_constraints
-
-goto :done
-
-:usage
-
-echo usage 		InstallSeed user/password@database
-
-:done
--- a/Schema/MESC.ctl
+++ b/Schema/MESC.ctl
@@ -1,23 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE meter_size_codes
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,qmax
-,valid_for_existing_meter
-,valid_for_new_meter
-)
-BEGINDATA
-U16|12.8|YES|YES
-U25|20|YES|YES
-U40|32|YES|YES
-U65|52|YES|YES
-U100|80|YES|YES
-U160|128|YES|YES
-Rotary/Turbine 2"|999|NO|YES
-Rotary/Turbine 3"|9999|NO|YES
-Rotary/Turbine 4"|99999|NO|YES
-Rotary/Turbine 6"|999999|NO|YES
-Other|9999999|NO|YES
--- a/Schema/SVCPT.ctl
+++ b/Schema/SVCPT.ctl
@@ -1,14 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE service_pressure_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-)
-BEGINDATA
-LP|Low Pressure
-MP|Medium Pressure
-HP|High Pressure
-IP|Intermediate Pressure
--- a/Schema/alty.ctl
+++ b/Schema/alty.ctl
@@ -1,45 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE asset_location_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-)
-BEGINDATA
-00|Unknown
-01|Cellar
-02|Under Stairs
-03|Hall
-04|Kitchen
-05|Bathroom
-06|Garage
-07|Canteen
-08|Cloakroom
-09|Cupboard
-10|Domestic Science
-11|Front Door
-12|Hall Cupboard
-13|Kitchen Cupboard
-14|Kitchen under sink
-15|Landing
-16|Office
-17|Office Cupboard
-18|Outside WC
-19|Pantry
-20|Porch
-21|Public Bar
-22|Rear of Shop
-23|Saloon Bar
-24|Shed
-25|Shop Front
-26|Shop Window
-27|Staff Room
-28|Store Room
-29|Toilet
-30|Under Counter
-31|Waiting Room
-32|Meter box Outside
-98|Other
-99|Outside
--- a/Schema/caca.ctl
+++ b/Schema/caca.ctl
@@ -1,30 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE care_categories
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-)
-BEGINDATA
-03|SEUC Unclassified
-04|Aged 60+
-05|Blind
-06|Braille User
-07|Poor Sight
-08|Deaf
-09|Poor Hearing
-10|Poor Speech
-11|Poor Sense of Smell
-12|Arthritic Hands
-13|Arthritic All
-14|Poor Walking
-15|Wheelchair
-16|Bedridden
-17|Mental Handicap
-18|Confused
-19|Serious Illness
-20|Other
-21|Heart Condition
-22|Breathing Difficulty
--- a/Schema/caco.ctl
+++ b/Schema/caco.ctl
@@ -1,30 +0,0 @@
-LOAD DATA
-INFILE *
-REPLACE
-INTO TABLE care_categories
-FIELDS TERMINATED BY ","
-(
-code
-,DESCRIPTION
-)
-BEGINDATA
-03,SEUC Unclassified
-04,Aged 60+
-05,Blind
-06,Braille User
-07,Poor Sight
-08,Deaf
-09,Poor Hearing
-10,Poor Speech
-11,Poor Sense of Smell
-12,Arthritic Hands
-13,Arthritic All
-14,Poor Walking
-15,Wheelchair
-16,Bedridden
-17,Mental Handicap
-18,Confused
-19,Serious Illness
-20,Other
-21,Heart Condition
-22,Breathing Difficulty
--- a/Schema/cnor.ctl
+++ b/Schema/cnor.ctl
@@ -1,16 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE connection_orientations
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-description
-,id
-)
-BEGINDATA
-Vertical Up|1
-Vertical Down|3
-Horizontal Left|2
-Horizontal Right|4
-Horizontal Back|5
-Horizontal Front|6
--- a/Schema/cnty.ctl
+++ b/Schema/cnty.ctl
@@ -1,13 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE connection_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-description
-,code
-)
-BEGINDATA
-(mm) BSPT|MMBSTP
-(mm) PN16|MMPN16
-INCH BS 746|INCHBS
--- a/Schema/comt.ctl
+++ b/Schema/comt.ctl
@@ -1,14 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE contact_mechanism_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-)
-BEGINDATA
-FAX|Fax
-PHONE|Telephone
-MOBILE|Mobile
-EMAIL|Email
--- a/Schema/delete_tables.sql
+++ b/Schema/delete_tables.sql
@@ -1,14 +0,0 @@
-set  wrap off
-set linesize 100
-set  feedback off
-set  pagesize 0
-set  verify off
-set TERMOUT off
-
-SPOOL ydeletey.sql
-SELECT 'delete from '||table_name||';' FROM user_tables
-
-spool off
-set termout on
-@ydeletey.sql
-exit
--- a/Schema/disable_constraints.sql
+++ b/Schema/disable_constraints.sql
@@ -1,21 +0,0 @@
-set  wrap off
-set linesize 100
-set  feedback off
-set  pagesize 0
-set  verify off
-set TERMOUT off
-
-SPOOL ytmpy.sql
-SELECT cmd FROM (
-SELECT 1 AS ord, 'alter table '||table_name||' disable constraint '||CONSTRAINT_name||';' AS cmd FROM user_constraints
-WHERE constraint_type = 'R'
-UNION
-SELECT 2 , 'alter table '||table_name||' disable constraint '||CONSTRAINT_name||';'FROM user_constraints
-WHERE constraint_type  = 'P'
-)
-ORDER BY ord;
-
-spool off
-set termout on
-@ytmpy.sql
-exit
--- a/Schema/enable_constraints.sql
+++ b/Schema/enable_constraints.sql
@@ -1,21 +0,0 @@
-set  wrap off
-set linesize 100
-set  feedback off
-set  pagesize 0
-set  verify off
-set TERMOUT off
-
-SPOOL ytmpy.sql
-SELECT cmd FROM (
-SELECT 2 AS ord, 'alter table '||table_name||' enable constraint '||CONSTRAINT_name||';' AS cmd FROM user_constraints
-WHERE constraint_type = 'R'
-UNION
-SELECT 1 , 'alter table '||table_name||' enable constraint '||CONSTRAINT_name||';'FROM user_constraints
-WHERE constraint_type  = 'P'
-)
-ORDER BY ord;
-
-spool off
-set termout on
-@ytmpy.sql
-exit
--- a/Schema/enrt.ctl
+++ b/Schema/enrt.ctl
@@ -1,14 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE role_types
-APPEND
-FIELDS TERMINATED BY '|'
-(
-rt_type
-,code
-,description
-)
-BEGINDATA
-ENRT|CREATOR|Created Enquiry
-ENRT|UPDATER|Updated Enquiry
-ENRT|RFQ|Request For Quotation
--- a/Schema/enst.ctl
+++ b/Schema/enst.ctl
@@ -1,13 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE enquiry_status_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-)
-BEGINDATA
-INP|In Progress
-SUBMITTED|Submitted For Quotation
-QUOTED|Quoted For
--- a/Schema/enty.ctl
+++ b/Schema/enty.ctl
@@ -1,19 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE enquiry_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-)
-BEGINDATA
-INSTALL|Installation of new non-Standard meter
-STD INSTALL|Installation of Standard meter
-OFMAT|Request for OFGEM Meter Accuracy Test (OFMAT)
-EXCHANGE|Exchange of meter
-REMOVE|Removal of non-Standard meter
-STD REMOVE|Removal of a Standard meter
-RELOCATE|Relocation of meters
-ADDON|Purchase of standard add-ons for an existing meter module
-OTHER|Other
--- a/Schema/fity.ctl
+++ b/Schema/fity.ctl
@@ -1,16 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE filter_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-)
-BEGINDATA
-LLS|Low Loss Strainer
-FIU|Fixed in Union
-YT|Y Type
-IL|InLine
-AP|Angle Pattern
-G|Gauze
--- a/Schema/hoty.ctl
+++ b/Schema/hoty.ctl
@@ -1,13 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE housing_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-)
-BEGINDATA
-LO|Lift Off
-WI|Walk In
-WT|Walk Through
--- a/Schema/mety.ctl
+++ b/Schema/mety.ctl
@@ -1,15 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE meter_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-)
-BEGINDATA
-ROTA|Rotary
-TURB|Turbine
-ORIF|Orifice
-ULTRA|Ultrasonic flow
-CORI|Coriolis
--- a/Schema/mip.con
+++ b/Schema/mip.con
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.con
 --
-- Generated for Oracle 10g on Thu Nov 08  15:09:01 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Mon Nov 12  10:04:33 2007 by Server Generator 10.1.2.6.18
  
 PROMPT Creating Primary Key on 'REGULATORS'
 ALTER TABLE REGULATORS
@@ -176,6 +176,13 @@ ALTER TABLE ROLE_TYPES
  (CODE))
 /

+PROMPT Creating Primary Key on 'PASSWORDS'
+ALTER TABLE PASSWORDS
+ ADD (CONSTRAINT PWD_PK PRIMARY KEY 
+  (PRTY_ID
+  ,CREATED_ON))
+/
+
 PROMPT Creating Primary Key on 'ASSET_LOCATION_TYPES'
 ALTER TABLE ASSET_LOCATION_TYPES
 ADD (CONSTRAINT ALTY_PK PRIMARY KEY 
@@ -220,6 +227,12 @@ ALTER TABLE ENQUIRY_ROLES
  ,RT_CODE))
 /

+PROMPT Creating Primary Key on 'ACCESS_CONTROLS'
+ALTER TABLE ACCESS_CONTROLS
+ ADD (CONSTRAINT ACCL_PK PRIMARY KEY 
+  (ID))
+/
+
 PROMPT Creating Primary Key on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
 ADD (CONSTRAINT ENQU_PK PRIMARY KEY 
@@ -302,20 +315,26 @@ ALTER TABLE PARTY_ROLES
 /


+PROMPT Creating Unique Key on 'COSTS'
+ALTER TABLE COSTS
+ ADD (CONSTRAINT COST_AIC0_UK UNIQUE 
+  (AICO_CODE))
+/
+
         
 PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
 ALTER TABLE METER_SIZE_CODES
- ADD (CONSTRAINT AVCON_1194534541_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194861873_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
 ALTER TABLE METER_SIZE_CODES
- ADD (CONSTRAINT AVCON_1194534541_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194861873_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'COSTS'
 ALTER TABLE COSTS
- ADD (CONSTRAINT AVCON_1194534541_COST__000 CHECK (COST_TYPE IN ('COST', 'BACO', 'HOCO', 'MECO', 'MOCO')))
+ ADD (CONSTRAINT AVCON_1194861873_COST__000 CHECK (COST_TYPE IN ('HOCO', 'BACO', 'COST', 'AICO', 'MOCO', 'MECO')))
 /
       
 PROMPT Creating Check Constraint on 'PARTY_RELATIONSHIPS'
@@ -327,89 +346,84 @@ to_parl_rt_code = to_prtp_rt_code))
 
 PROMPT Creating Check Constraint on 'QUOTES'
 ALTER TABLE QUOTES
- ADD (CONSTRAINT AVCON_1194534541_QUTE__000 CHECK (QUTE_TYPE IN ('QUTE', 'SQ', 'AQ', 'MQ')))
+ ADD (CONSTRAINT AVCON_1194861873_QUTE__000 CHECK (QUTE_TYPE IN ('QUTE', 'SQ', 'AQ', 'MQ')))
 /
     
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1194534541_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
+ ADD (CONSTRAINT AVCON_1194861873_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
 /

 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1194534541_PRTY__000 CHECK (PRTY_TYPE 
+ ADD (CONSTRAINT AVCON_1194861873_PRTY__000 CHECK (PRTY_TYPE 
 IN ('PRTY', 'IO', 'EO', 'MKTP', 'PERS', 'MANU', 'NEMP', 'EMP', 'ORG'
 )))
 /
   
 PROMPT Creating Check Constraint on 'ROLE_TYPES'
 ALTER TABLE ROLE_TYPES
- ADD (CONSTRAINT AVCON_1194534541_RT_TY_000 CHECK (RT_TYPE IN ('PCMRT', 'PART', 'QURT', 'PRT', 'RT', 'ENRT')))
+ ADD (CONSTRAINT AVCON_1194861873_RT_TY_000 CHECK (RT_TYPE IN ('ENRT', 'QURT', 'PRT', 'PCMRT', 'PART', 'RT')))
 /
-        
+          
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194861873_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194861873_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194861873_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194861873_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
+ ADD (CONSTRAINT AVCON_1194861873_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194861873_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194861873_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194861873_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_BYPAS_000 CHECK (BYPASS_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194861873_LOGGE_000 CHECK (LOGGER_REQUIRED IN ('YES', 'NO')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_LOGGE_000 CHECK (LOGGER_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194861873_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
+ ADD (CONSTRAINT AVCON_1194861873_EXIST_000 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
 /

 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_EXIST_000 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
-/
-
-PROMPT Creating Check Constraint on 'ENQUIRIES'
-ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194534541_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
+ ADD (CONSTRAINT AVCON_1194861873_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
 /
            

@@ -666,6 +680,13 @@ ALTER TABLE QUOTE_ITEMS ADD (CONSTRAINT
  (ID))
 /

+PROMPT Creating Foreign Key on 'PASSWORDS'
+ALTER TABLE PASSWORDS ADD (CONSTRAINT
+ PWD_PRTY_FK FOREIGN KEY 
+  (PRTY_ID) REFERENCES PARTIES
+  (ID))
+/
+
 PROMPT Creating Foreign Key on 'METERS'
 ALTER TABLE METERS ADD (CONSTRAINT
 METR_DRWG_FK FOREIGN KEY 
@@ -722,9 +743,16 @@ ALTER TABLE ENQUIRY_ROLES ADD (CONSTRAINT
  (CODE))
 /

+PROMPT Creating Foreign Key on 'ACCESS_CONTROLS'
+ALTER TABLE ACCESS_CONTROLS ADD (CONSTRAINT
+ ACCL_RT_FK FOREIGN KEY 
+  (RT_CODE) REFERENCES ROLE_TYPES
+  (CODE))
+/
+
 PROMPT Creating Foreign Key on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES ADD (CONSTRAINT
- ENQU_COMT_CONSUMER_FK FOREIGN KEY 
+ ENQU_COMT_CONS_FK FOREIGN KEY 
  (CONSUMER_COMT_CODE) REFERENCES CONTACT_MECHANISM_TYPES
  (CODE))
 /
@@ -752,7 +780,7 @@ ALTER TABLE ENQUIRIES ADD (CONSTRAINT

 PROMPT Creating Foreign Key on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES ADD (CONSTRAINT
- ENQU_COMT_ALT_CONSUMER_FK FOREIGN KEY 
+ ENQU_COMT_ALT_CONS_FK FOREIGN KEY 
  (ALT_CONSUMER_COMT_CODE) REFERENCES CONTACT_MECHANISM_TYPES
  (CODE))
 /
--- a/Schema/mip.ind
+++ b/Schema/mip.ind
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.ind
 --
-- Generated for Oracle 10g on Thu Nov 08  15:09:01 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Mon Nov 12  10:04:33 2007 by Server Generator 10.1.2.6.18
  

 PROMPT Creating Index 'REGU_RETY_FK_I'
@@ -179,6 +179,11 @@ CREATE INDEX QUIT_HOU_FK_I ON QUOTE_ITEMS
 (HOU_CODE)
 /

+PROMPT Creating Index 'PWD_PRTY_FK_I'
+CREATE INDEX PWD_PRTY_FK_I ON PASSWORDS
+ (PRTY_ID)
+/
+
 PROMPT Creating Index 'METR_METY_FK_I'
 CREATE INDEX METR_METY_FK_I ON METERS
 (METY_CODE)
@@ -219,13 +224,18 @@ CREATE INDEX ENRO_ENQU_FK_I ON ENQUIRY_ROLES
 (ENQU_CODE)
 /

+PROMPT Creating Index 'ACCL_RT_FK_I'
+CREATE INDEX ACCL_RT_FK_I ON ACCESS_CONTROLS
+ (RT_CODE)
+/
+
 PROMPT Creating Index 'ENQU_METY_FK_I'
 CREATE INDEX ENQU_METY_FK_I ON ENQUIRIES
 (METY_CODE)
 /

-PROMPT Creating Index 'ENQU_MESC_REQUIRED_FK_I'
-CREATE INDEX ENQU_MESC_REQUIRED_FK_I ON ENQUIRIES
+PROMPT Creating Index 'ENQU_MESC_FK_I'
+CREATE INDEX ENQU_MESC_FK_I ON ENQUIRIES
 (REQUIRED_MESC_CODE)
 /

@@ -239,8 +249,8 @@ CREATE INDEX ENQU_SVCP_FK_I ON ENQUIRIES
 (EXISTING_SVCP_CODE)
 /

-PROMPT Creating Index 'ENQU_COMT_CONSUMER_FK_I'
-CREATE INDEX ENQU_COMT_CONSUMER_FK_I ON ENQUIRIES
+PROMPT Creating Index 'ENQU_COMT_CONS_FK_I'
+CREATE INDEX ENQU_COMT_CONS_FK_I ON ENQUIRIES
 (CONSUMER_COMT_CODE)
 /

@@ -259,13 +269,13 @@ CREATE INDEX ENQU_ALTY_FK_I ON ENQUIRIES
 (ALTY_CODE)
 /

-PROMPT Creating Index 'ENQU_COMT_AGENT_FK_I'
-CREATE INDEX ENQU_COMT_AGENT_FK_I ON ENQUIRIES
+PROMPT Creating Index 'ENQU_COMT_FK_AGENT_I'
+CREATE INDEX ENQU_COMT_FK_AGENT_I ON ENQUIRIES
 (AGENT_COMT_CODE)
 /

-PROMPT Creating Index 'ENQU_COMT_FK_I'
-CREATE INDEX ENQU_COMT_FK_I ON ENQUIRIES
+PROMPT Creating Index 'ENQU_COMT_ALT_CONS_FK_I'
+CREATE INDEX ENQU_COMT_ALT_CONS_FK_I ON ENQUIRIES
 (ALT_CONSUMER_COMT_CODE)
 /

--- a/Schema/mip.sql
+++ b/Schema/mip.sql
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.sql
 --
-- Generated for Oracle 10g on Thu Nov 08  15:09:02 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Mon Nov 12  10:04:34 2007 by Server Generator 10.1.2.6.18


 SPOOL mip.lst
--- a/Schema/mip.sqs
+++ b/Schema/mip.sqs
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.sqs
 --
-- Generated for Oracle 10g on Thu Nov 08  15:09:01 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Mon Nov 12  10:04:33 2007 by Server Generator 10.1.2.6.18
 
 PROMPT Creating Sequence 'FLTR_SEQ'
 CREATE SEQUENCE FLTR_SEQ
@@ -30,6 +30,13 @@ CREATE SEQUENCE CNOR_SEQ
 NOCYCLE
 /

+PROMPT Creating Sequence 'ACCL_SEQ'
+CREATE SEQUENCE ACCL_SEQ
+ NOMAXVALUE
+ NOMINVALUE
+ NOCYCLE
+/
+
 PROMPT Creating Sequence 'QUTE_SEQ'
 CREATE SEQUENCE QUTE_SEQ
 NOMAXVALUE
--- a/Schema/mip.tab
+++ b/Schema/mip.tab
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.tab
 --
-- Generated for Oracle 10g on Thu Nov 08  15:09:01 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Mon Nov 12  10:04:33 2007 by Server Generator 10.1.2.6.18
 


@@ -77,14 +77,16 @@ CREATE TABLE METER_SIZE_CODES
 (CODE VARCHAR2(80) NOT NULL
 ,DESCRIPTION VARCHAR2(80)
 ,QMAX NUMBER NOT NULL
- ,VALID_FOR_EXISTING_METER VARCHAR2(240) NOT NULL
- ,VALID_FOR_NEW_METER VARCHAR2(240) NOT NULL
+ ,VALID_FOR_EXISTING_METER VARCHAR2(3) NOT NULL
+ ,VALID_FOR_NEW_METER VARCHAR2(3) NOT NULL
 )
 /

 PROMPT Creating Table 'COSTS'
 CREATE TABLE COSTS
- (COST_PRICE NUMBER(*,2)
+ (AICO_CODE VARCHAR2(80)
+ ,COST_PRICE NUMBER(*,2)
+ ,DESCRIPTION VARCHAR2(80)
 ,VALID_FROM DATE NOT NULL
 ,REGI_CODE VARCHAR2(80)
 ,BAS_CODE VARCHAR2(80)
@@ -229,7 +231,6 @@ CREATE TABLE PARTIES
 ,GT_7B_CONTRACT_REF VARCHAR2(25)
 ,ADVERSARIAL_CONTRACT_REF VARCHAR2(25)
 ,USERNAME VARCHAR2(80)
- ,PASSWORD_HASH VARCHAR2(255)
 ,STATUS VARCHAR2(6)
 ,FIRST_NAME VARCHAR2(80)
 ,LAST_NAME VARCHAR2(80)
@@ -267,6 +268,15 @@ CREATE TABLE ROLE_TYPES
 )
 /

+PROMPT Creating Table 'PASSWORDS'
+CREATE TABLE PASSWORDS
+ (PRTY_ID NUMBER(*,0) NOT NULL
+ ,PASSWORD_HASH VARCHAR2(255) NOT NULL
+ ,CREATED_ON DATE NOT NULL
+ ,CREATED_BY NUMBER
+ )
+/
+
 PROMPT Creating Table 'ASSET_LOCATION_TYPES'
 CREATE TABLE ASSET_LOCATION_TYPES
 (CODE VARCHAR2(80) NOT NULL
@@ -338,6 +348,15 @@ CREATE TABLE ENQUIRY_ROLES
 )
 /

+PROMPT Creating Table 'ACCESS_CONTROLS'
+CREATE TABLE ACCESS_CONTROLS
+ (PAGE_NUMBER NUMBER NOT NULL
+ ,RT_CODE VARCHAR2(80)
+ ,ITEM VARCHAR2(80)
+ ,ID NUMBER(*,0) NOT NULL
+ )
+/
+
 PROMPT Creating Table 'ENQUIRIES'
 CREATE TABLE ENQUIRIES
 (CODE VARCHAR2(80) NOT NULL
@@ -359,9 +378,9 @@ CREATE TABLE ENQUIRIES
 ,REQUIRED_IP_DETAILS VARCHAR2(250)
 ,REQUIRED_IP_MBAR NUMBER
 ,OUTLET_PRESSURE NUMBER
- ,HOUSING_REQUIRED VARCHAR2(240)
- ,BASE_REQUIRED VARCHAR2(240)
- ,TWIN_STREAM_REQUIRED VARCHAR2(240)
+ ,HOUSING_REQUIRED VARCHAR2(3)
+ ,BASE_REQUIRED VARCHAR2(3)
+ ,TWIN_STREAM_REQUIRED VARCHAR2(3)
 ,QMAX NUMBER
 ,EXISTING_METER_MODEL VARCHAR2(10)
 ,OTHER_INFORMATION VARCHAR2(250)
@@ -385,25 +404,25 @@ CREATE TABLE ENQUIRIES
 ,ACCESS_ADDITIONAL VARCHAR2(210)
 ,MPRN_ALT VARCHAR2(250)
 ,ANNUAL_QUANTITY NUMBER
- ,DOWNSTREAM_BOOSTER_OR_COMPRESS VARCHAR2(240)
+ ,DOWNSTREAM_BOOSTER_OR_COMPRESS VARCHAR2(3)
 ,INDICATIVE_DATE DATE
 ,INDICATIVE_TIME VARCHAR2(2) DEFAULT 'DY'
 ,OTHER_PROJECT_REFERENCE VARCHAR2(50)
- ,CONVERTOR_REQUIRED VARCHAR2(240)
- ,AMR_REQUIRED VARCHAR2(240)
- ,EMS_REQUIRED VARCHAR2(240)
- ,BYPASS_REQUIRED VARCHAR2(240)
- ,LOGGER_REQUIRED VARCHAR2(240)
+ ,CONVERTOR_REQUIRED VARCHAR2(3)
+ ,AMR_REQUIRED VARCHAR2(3)
+ ,EMS_REQUIRED VARCHAR2(3)
+ ,BYPASS_REQUIRED VARCHAR2(40)
+ ,LOGGER_REQUIRED VARCHAR2(3)
 ,QMIN NUMBER
 ,LOAD_CONTROL_TYPE VARCHAR2(10)
 ,EXISTING_METER_SERIAL_NO VARCHAR2(14)
 ,EXISTING_METER_OWNER VARCHAR2(1)
 ,EXISTING_METER_ASSET_PROVIDER VARCHAR2(210)
 ,MARKET_SECTOR_CODE VARCHAR2(1) DEFAULT 'I'
+ ,JOB_DESCRIPTION VARCHAR2(500)
 ,CREATED_BY NUMBER NOT NULL
 ,UPDATED_BY NUMBER
 ,UPDATED_ON DATE
- ,METER_SIZE VARCHAR2(240)
 )
 /

--- a/Schema/part.ctl
+++ b/Schema/part.ctl
@@ -1,13 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE role_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-rt_type
-,code
-,description
-)
-BEGINDATA
-PART|OFFICE|Office
-PART|HOME|Home
--- a/Schema/pcmrt.ctl
+++ b/Schema/pcmrt.ctl
@@ -1,23 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE role_types
-APPEND
-FIELDS TERMINATED BY '|'
-(
-rt_type
-,code
-,description
-)
-BEGINDATA
-PCMRT|BILLADDR|Billing inquiries
-PCMRT|BILLPHONE|Billing inquiries number
-PCMRT|MAINOFFADDR|Main office address
-PCMRT|MAINOFFPHONE|Main office number
-PCMRT|MAINOFFFAX|Main office fax
-PCMRT|SECOFFPHONE|Secondary office number
-PCMRT|SECOFFFAX|Secondary office fax
-PCMRT|MAINHOMEADDR|Main home address
-PCMRT|MAINHOMEPHONE|Main home number
-PCMRT|MAINHOMEFAX|Main home fax
-PCMRT|SECHOMEPHONE|Secondary home number
-PCMRT|SECHOMEFAX|Secondary home fax
--- a/Schema/prt.ctl
+++ b/Schema/prt.ctl
@@ -1,20 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE role_types
-APPEND
-FIELDS TERMINATED BY '|'
-(
-rt_type
-,code
-,description
-)
-BEGINDATA
-PRT|AGENT|Agent
-PRT|SUPP|Service supplier
-PRT|SUPPADMIN|User administrator
-PRT|MIPADMIN|System Administrator
-PRT|ICU|Quotation operative
-PRT|CS|Customer Service operative
-PRT|INORG|Internal organization
-PRT|EXTORG|External organization
-PRT|MEMBER|Member of a group
--- a/Schema/prtp.ctl
+++ b/Schema/prtp.ctl
@@ -1,19 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE party_relationship_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-to_rt_code
-,from_rt_code
-,description
-)
-BEGINDATA
-SUPP|AGENT|Agent for Service Supplier
-SUPP|SUPPADMIN|Administrator for Supplier
-AGENT|SUPPADMIN|Administrator of agent
-SUPPADMIN|AGENT|Administered by
-INORG|MEMBER|Member of internal organization
-EXTORG|MEMBER|Member of external organization
-INORG|ICU|Handles quotations for internal organization
-INORG|CS|Handles customer enquiries for internal organization
--- a/Schema/qurt.ctl
+++ b/Schema/qurt.ctl
@@ -1,17 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE role_types
-APPEND
-FIELDS TERMINATED BY '|'
-(
-rt_type
-,code
-,description
-)
-BEGINDATA
-QURT|Q RFQ|Submitted request for quotation
-QURT|Q OWN|Owner of quotation
-QURT|Q ACC|Owner of accepted quotation
-QURT|Q REJ|Owner of rejected quotation
-QURT|Q SUBACC|Submitted acceptance of quotation
-QURT|Q SUBREJ|Submitted rejection of quotation
--- a/Schema/qust.ctl
+++ b/Schema/qust.ctl
@@ -1,16 +0,0 @@
-LOAD DATA
-INFILE *
-REPLACE
-INTO TABLE quote_statuses
-FIELDS TERMINATED BY ","
-(
-CODE
-,DESCRIPTION
-)
-BEGINDATA
-INP,In Progress
-AV,Available
-ACC,Accepted
-USERREJ,Rejected by user
-ACCREJ,Rejected because associated quote accepted
-LAPSE,Lapsed
--- a/Schema/rety.ctl
+++ b/Schema/rety.ctl
@@ -1,22 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE regulator_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-)
-BEGINDATA
-J90A|J90 Angled
-DF270R|Donkin Fig 270R
-DF280/309|Donkin Fig 280/309
-DF280|Donkin Fig 280
-RBI 2111|RBI 2111
-RBI 2011|RBI 2011
-RBI 2611|RBI 2611
-RBI 3211|RBI 3211
-RBE 1711|RBE 1711
-RBE 4011|RBE 4011
-SPERYN G1000|SPERYN G1000
-J48|J48
--- a/Schema/rvty.ctl
+++ b/Schema/rvty.ctl
@@ -1,13 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE relief_valve_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-)
-BEGINDATA
-INTEGRAL|Integral
-10L|10L
-VS811|VS811
--- a/Schema/slty.ctl
+++ b/Schema/slty.ctl
@@ -1,12 +0,0 @@
-LOAD DATA
-INFILE *
-REPLACE
-INTO TABLE slamshut_types
-FIELDS TERMINATED BY ","
-(
-CODE
-,DESCRIPTION
-)
-BEGINDATA
-INTEGRAL,Integral
-DF305,Donkin Fig 305
--- a/Schema/slva.ctl
+++ b/Schema/slva.ctl
@@ -1,12 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE slamshut_types
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-)
-BEGINDATA
-INTEGRAL|Integral
-DF305|Donkin Fig 305
--- a/Schema/svcp.ctl
+++ b/Schema/svcp.ctl
@@ -1,17 +0,0 @@
-LOAD DATA
-INFILE *
-INTO TABLE service_pressures
-REPLACE
-FIELDS TERMINATED BY '|'
-(
-code
-,description
-,svcpt_code
-)
-BEGINDATA
-LP|LP|LP
-MP35|MP35|MP
-MP65|MP65|MP
-MP180|MP180|MP
-MP270|MP270|MP
-IP|IP|IP