Changeset 2452 for pykota/trunk/initscripts

Timestamp:

09/17/05 16:29:43 (19 years ago)

Author:

jerome

Message:

Upgraded database schema.
Added -i | --ingroups command line option to repykota.
Added -C | --comment command line option to edpykota.
Added 'noquota', 'noprint', and 'nochange' as switches for edpykota's
-l | --limitby command line option.
Severity : entirely new features, in need of testers :-)

Location:

pykota/trunk/initscripts

Files:

• ldap/pykota.schema (modified) (2 diffs)
• postgresql/pykota-postgresql.sql (modified) (2 diffs)
• postgresql/README.postgresql (modified) (1 diff)
• postgresql/upgrade-to-1.23.sql (modified) (4 diffs)

pykota/trunk/initscripts/ldap/pykota.schema

@@ -244 +244 @@
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-# pykotaTemporaryDenied
-attributetype ( 1.3.6.1.4.1.16868.1.1.36 NAME 'pykotaTemporaryDenied'
-        DESC 'Indicates if the user is temporarily denied to print'
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
-
 # pykotaPassThrough
-attributetype ( 1.3.6.1.4.1.16868.1.1.37 NAME 'pykotaPassThrough'
+attributetype ( 1.3.6.1.4.1.16868.1.1.36 NAME 'pykotaPassThrough'
         DESC 'Indicates if the printer is in pass through mode'
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
@@ -280 +275 @@
         DESC 'PyKota User Quota on a Printer'
         MUST ( cn $ pykotaUserName $ pykotaPrinterName )
-        MAY  ( pykotaMaxJobSize $ pykotaTemporaryDenied $ pykotaPageCounter $ pykotaLifePageCounter $ pykotaSoftLimit $ pykotaHardLimit $ pykotaDateLimit $ pykotaWarnCount ) )
+        MAY  ( pykotaMaxJobSize $ pykotaPageCounter $ pykotaLifePageCounter $ pykotaSoftLimit $ pykotaHardLimit $ pykotaDateLimit $ pykotaWarnCount ) )
         
 # pykotaGroupPQuota        

pykota/trunk/initscripts/postgresql/pykota-postgresql.sql

@@ -87 +87 @@
                         datelimit TIMESTAMP,
                         maxjobsize INT4,
-                        temporarydenied BOOLEAN DEFAULT 'f',
                         warncount INT4 DEFAULT 0); 
 CREATE INDEX userpquota_u_id_ix ON userpquota (userid);
@@ -155 +154 @@
                        userid INT4 REFERENCES users(id),
                        amount FLOAT,
+                       description TEXT,
                        date TIMESTAMP DEFAULT now());
 CREATE INDEX payments_date_ix ON payments (date);

pykota/trunk/initscripts/postgresql/README.postgresql

@@ -57 +57 @@
   database schema are included. You may have to run all
   of them or only some of them, depending on your 
-  version of PyKota.
+  version of PyKota. Usually running them several times, for
+  example if you used several different development versions
+  of PyKota, won't do any harm.
   
+  * An SQL script to upgrade a 1.22 PyKota Storage DataBase to
+    1.23 is included. Launch it this way on the Quota Storage Server :
+    
+        $ psql -U postgres pykota
+        pykota=# \i upgrade-to-1.23.sql
+        pykota=# \q
+        $
+        
+    This script adds many fields to existing tables, and a table to
+    manage billing codes.
+    
   * An SQL script to upgrade a 1.20 PyKota Storage DataBase to
     1.21 is included. Launch it this way on the Quota Storage Server :

pykota/trunk/initscripts/postgresql/upgrade-to-1.23.sql

@@ -22 +22 @@
 --
 -- This script has to be used if you already
--- have a pre-1.23alpha12 version of PyKota to upgrade
+-- have a pre-1.23alpha30 version of PyKota to upgrade
 -- your database schema. 
 --
@@ -34 +34 @@
 ALTER TABLE groups ADD COLUMN description TEXT;
 ALTER TABLE userpquota ADD COLUMN maxjobsize INT4;
-ALTER TABLE userpquota ADD COLUMN temporarydenied BOOLEAN;
-ALTER TABLE userpquota ALTER COLUMN temporarydenied SET DEFAULT 'f';
 ALTER TABLE grouppquota ADD COLUMN maxjobsize INT4;
 ALTER TABLE printers ADD COLUMN maxjobsize INT4;
@@ -42 +40 @@
 ALTER TABLE jobhistory ADD COLUMN precomputedjobsize INT4;
 ALTER TABLE jobhistory ADD COLUMN precomputedjobprice FLOAT;
+ALTER TABLE payments ADD COLUMN description TEXT;
+
+ALTER TABLE userpquota DROP COLUMN temporarydenied;
 
 --
@@ -47 +48 @@
 --
 -- Just to be sure
-UPDATE userpquota SET temporarydenied='f';
 UPDATE printers SET passthrough='f';