Index: pykota/trunk/initscripts/README.postgresql
===================================================================
--- pykota/trunk/initscripts/README.postgresql (revision 887)
+++ pykota/trunk/initscripts/README.postgresql (revision 900)
@@ -93,4 +93,4 @@
   1.03, YOU HAVE TO RUN the upgrade-1.01-to-1.03.sh shell script.
   NOT LAUNCHING THIS SCRIPT WILL CAUSE PYKOTA TO STOP WORKING !
-  Please don't run this script if your version of PyKota is already
-  1.03 or higher.
+  Please don't run this script if your existing version of PyKota is 
+  already 1.03 or higher.
Index: pykota/trunk/initscripts/pykota-postgresql.sql
===================================================================
--- pykota/trunk/initscripts/pykota-postgresql.sql (revision 897)
+++ pykota/trunk/initscripts/pykota-postgresql.sql (revision 900)
@@ -20,4 +20,7 @@
 --
 -- $Log$
+-- Revision 1.10  2003/04/10 21:47:20  jalet
+-- Job history added. Upgrade script neutralized for now !
+--
 -- Revision 1.9  2003/04/09 20:11:29  jalet
 -- Added a field to save the action taken for this job (Allow, Deny)
@@ -93,8 +96,5 @@
 --
 CREATE TABLE printers(id SERIAL PRIMARY KEY NOT NULL,
-                      printername TEXT UNIQUE NOT NULL,
-                      lastjobid TEXT,
-                      lastusername TEXT,
-                      pagecounter INT4 DEFAULT 0);
+                      printername TEXT UNIQUE NOT NULL);
                     
 --
@@ -111,5 +111,5 @@
                         
 --
--- Create the job history table for u
+-- Create the job history table
 --
 CREATE TABLE jobhistory(id SERIAL PRIMARY KEY NOT NULL,
@@ -117,6 +117,7 @@
                         userid INT4 REFERENCES users(id),
                         printerid INT4 REFERENCES printers(id),
+                        pagecounter INT4 DEFAULT 0,
+                        jobsize INT4,
                         action TEXT,
-                        jobsize INT4,
                         jobdate TIMESTAMP DEFAULT now());
                         
@@ -145,4 +146,6 @@
 GRANT SELECT, UPDATE ON users_id_seq, groups_id_seq, printers_id_seq, userpquota_id_seq, grouppquota_id_seq, jobhistory_id_seq TO pykotaadmin;
 GRANT SELECT, UPDATE ON printers, userpquota, grouppquota TO pykotauser;
-GRANT SELECT ON users, groups, groupsmembers, jobhistory TO pykotauser;
+GRANT SELECT ON users, groups, groupsmembers TO pykotauser;
+GRANT SELECT, INSERT, UPDATE ON jobhistory TO pykotauser;
+GRANT SELECT, UPDATE ON jobhistory_id_seq TO pykotauser;
 
Index: pykota/trunk/initscripts/upgrade-1.01-to-1.03.sh
===================================================================
--- pykota/trunk/initscripts/upgrade-1.01-to-1.03.sh (revision 888)
+++ pykota/trunk/initscripts/upgrade-1.01-to-1.03.sh (revision 900)
@@ -5,16 +5,22 @@
 echo WARNING : If unsure press Ctrl+C NOW TO STOP, else press ENTER TO PROCEED
 read
-echo -n Update begins...
-pg_dump -D -N -U postgres -f pykotadb-full.dump pykota >update.messages 2>update.errors
-pg_dump -a -D -N -U postgres -f pykotadb.dump pykota >>update.messages 2>>update.errors
-dropdb pykota >>update.messages 2>>update.errors
-dropuser pykotaadmin >>update.messages 2>>update.errors
-dropuser pykotauser >>update.messages 2>>update.errors
-psql -U postgres template1 -f pykota-postgresql.sql >>update.messages 2>>update.errors
-psql -U postgres pykota -f pykotadb.dump >>update.messages 2>>update.errors
-echo
-echo Done !
-echo Check the files update.messages and update.errors to see if all is OK.
-echo NOTICE messages are normal and expected. In case other message types
-echo are found in update.errors, please file a bug report and restore
-echo your database from pykotadb-full.dump
+
+echo This script does not work at all yet !
+echo Please be patient so that I can write a safe upgrade script
+echo of completely drop your existing database to start anew
+echo with this version of PyKota.
+
+#echo -n Update begins...
+#pg_dump -D -N -U postgres -f pykotadb-full.dump pykota >upgrade.messages 2>upgrade.errors
+#pg_dump -a -D -N -U postgres -f pykotadb.dump pykota >>upgrade.messages 2>>upgrade.errors
+#dropdb pykota >>upgrade.messages 2>>upgrade.errors
+#dropuser pykotaadmin >>upgrade.messages 2>>upgrade.errors
+#dropuser pykotauser >>upgrade.messages 2>>upgrade.errors
+#psql -U postgres template1 -f pykota-postgresql.sql >>upgrade.messages 2>>upgrade.errors
+#psql -U postgres pykota -f pykotadb.dump >>upgrade.messages 2>>upgrade.errors
+#echo
+#echo Done !
+#echo Check the files upgrade.messages and upgrade.errors to see if all is OK.
+#echo NOTICE messages are normal and expected. In case other message types
+#echo are found in upgrade.errors, please file a bug report and restore
+#echo your database from pykotadb-full.dump
