Changeset 38157 for trunk/ippTools/share

Timestamp:

Apr 20, 2015, 12:32:54 PM (11 years ago)

Author:

bills

Message:

Add 3 new postage stamp tables to the IPP database config.
Note that we don't keep the postage stamp tables in the gpc1 database
so there are no changes listed in dbconfig/changes.txt to update them.
We do that to avoid mistakenly using pstamptool without setting the dbserver to
the system that actually hosts the ippRequestServer database (currently ippc17).

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• pstamptool_addaccesslevel.sql (added)
• pxadmin_create_tables.sql (modified) (1 diff)
• pxadmin_drop_tables.sql (modified) (2 diffs)

trunk/ippTools/share/Makefile.am

@@ -359 +359 @@
         pstamptool_stopdependentjob.sql \
         pstamptool_updatejob.sql \
+        pstamptool_addaccesslevel.sql \
         pxadmin_create_tables.sql \
         pxadmin_create_mirror_tables.sql \

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1511 +1511 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE pstampUserDomain (
+    domainName      VARCHAR(64),
+    accessLevel     INT,
+    defaultProduct  VARCHAR(255),
+    defaultLabel    VARCHAR(64),
+    PRIMARY KEY(domainName)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE pstampUser (
+    userName        VARCHAR(64),
+    domainName      VARCHAR(64),
+    accessLevel     INT,
+    defaultProduct  VARCHAR(255),
+    defaultLabel    VARCHAR(64),
+    PRIMARY KEY (userName, domainName)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE pstampAccessLevel (
+    proj_id         BIGINT,
+    accessLevel     INT,
+    mjd_min         FLOAT DEFAULT 0,
+    mjd_max         FLOAT DEFAULT 0,
+    PRIMARY KEY (proj_id, accessLevel),
+    UNIQUE KEY (proj_id, accessLevel),
+    FOREIGN KEY(proj_id) REFERENCES pstampProject(proj_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 CREATE TABLE pstampWebRequest (
         num BIGINT AUTO_INCREMENT,

trunk/ippTools/share/pxadmin_drop_tables.sql

@@ -69 +69 @@
 DROP TABLE IF EXISTS pstampProject;
 DROP TABLE IF EXISTS pstampRequest;
+DROP TABLE IF EXISTS pstampDependent;
+DROP TABLE IF EXISTS pstampWebRequest;
+DROP TABLE IF EXISTS pstampFile;
 DROP TABLE IF EXISTS pstampJob;
+DROP TABLE IF EXISTS pstampUserDomain;
+DROP TABLE IF EXISTS pstampUser;
+DROP TABLE IF EXISTS pstampAccessLevel;
 DROP TABLE IF EXISTS distRun;
 DROP TABLE IF EXISTS distTarget;
@@ -85 +91 @@
 DROP TABLE IF EXISTS publishRun;
 DROP TABLE IF EXISTS publishDone;
-DROP TABLE IF EXISTS pstampDependent;
-DROP TABLE IF EXISTS pstampFile;
 DROP TABLE IF EXISTS staticskyInput;
 DROP TABLE IF EXISTS staticskyResult;
 DROP TABLE IF EXISTS staticskyRun;
 DROP TABLE IF EXISTS Label;
-DROP TABLE IF EXISTS pstampWebRequest;
 DROP TABLE IF EXISTS chipBackgroundRun;
 DROP TABLE IF EXISTS chipBackgroundImfile;