Merge pull request #46 from colincoghill/develop

Develop

bin/oasisdb

@@ -161,29 +161,36 @@ def calc_stats(DB):
     Stats.do_initial_stats_update()
 
 
-def upgrade_3_6_to_3_9_2(DB):
-    """ Given a 3.6 database, upgrade it to 3.9.2.
+def upgrade_3_6_to_3_9_3(DB):
+    """ Given a 3.6 database, upgrade it to 3.9.3
     """
     with open(os.path.join(APPDIR, "deploy", "migrate_36x_to_392.sql")) as f:
         sql = f.read()
 
     DB.run_sql(sql)
     print "Migrated table structure from 3.6 to 3.9.2"
     calc_stats(DB)
+    with open(os.path.join(APPDIR, "deploy", "migrate_392_to_393.sql")) as f:
+        sql = f.read()
+    DB.run_sql(sql)
+    print "Migrated table structure from 3.9.2 to 3.9.3"
     if not options.noresetadmin:
-        generate_admin_passwd(DB)
+        generate_admin_passwd(DB)  # 3.6 passwords were in a slightly less secure format
 
 
-def upgrade_3_9_1_to_3_9_2(DB):
+def upgrade_3_9_1_to_3_9_3(DB):
     """ Given a 3.9.1 database, upgrade it to 3.9.2.
     """
     with open(os.path.join(APPDIR, "deploy", "migrate_391_to_392.sql")) as f:
         sql = f.read()
 
     DB.run_sql(sql)
     print "Migrated table structure from 3.9.1 to 3.9.2"
-    if not options.noresetadmin:
-        generate_admin_passwd(DB)
+
+    with open(os.path.join(APPDIR, "deploy", "migrate_392_to_393.sql")) as f:
+        sql = f.read()
+    DB.run_sql(sql)
+    print "Migrated table structure from 3.9.2 to 3.9.3"
 
 
 def upgrade_3_9_2_to_3_9_3(DB):
@@ -194,8 +201,6 @@ def upgrade_3_9_2_to_3_9_3(DB):
 
     DB.run_sql(sql)
     print "Migrated table structure from 3.9.2 to 3.9.3"
-    if not options.noresetadmin:
-        generate_admin_passwd(DB)
 
 
 def clean_install_3_6(DB):
@@ -406,6 +411,9 @@ def do_init(DB, options):
         elif options.oaver == '3.9.2':
             erase_existing(DB)  # might be some dregs, like sequences or views
             clean_install_3_9_2(DB)
+        elif options.oaver == '3.9.3':
+            erase_existing(DB)  # might be some dregs, like sequences or views
+            clean_install_3_9_3(DB)
         else:
             print "Unknown database version (%s)" % (options.oaver,)
             print "Available options:    3.6   3.9.1   3.9.2   3.9.3"
@@ -467,10 +475,10 @@ def do_upgrade(DB, options):
 
     dbver = DB.get_db_version()
     if dbver == "3.6":
-        upgrade_3_6_to_3_9_2(DB)
+        upgrade_3_6_to_3_9_3(DB)
         sys.exit()
     if dbver == "3.9.1":
-        upgrade_3_9_1_to_3_9_2(DB)
+        upgrade_3_9_1_to_3_9_3(DB)
         sys.exit()
     if dbver == "3.9.2":
         upgrade_3_9_2_to_3_9_3(DB)

deploy/migrate_36x_to_392.sql

@@ -31,10 +31,6 @@ ALTER TABLE courses ADD COLUMN "assess_visibility" character varying DEFAULT 'en
 ALTER TABLE exams ADD COLUMN "code" character varying;
 ALTER TABLE exams ADD COLUMN "instant" integer;
 
-ALTER TABLE users ADD COLUMN "email" character varying;
-ALTER TABLE users ADD COLUMN "source" character varying;
-ALTER TABLE users ADD COLUMN "expiry" timestamp with time zone;
-
 ALTER TABLE users ADD COLUMN "confirmed" character varying;
 ALTER TABLE users ADD COLUMN "confirmation_code" character varying;
 ALTER TABLE users ALTER COLUMN "passwd" TYPE character varying;

src/templates/cadmin_examresults.html

@@ -47,7 +47,7 @@ <h4>{{ group.title }}</h4>
                         <td>{{ users[user_id]['uname'] }}</td>
                         <td>{{ users[user_id]['familyname'] }}</td>
                         <td>{{ users[user_id]['givenname'] }}</td>
-                        <td>{{ users[user_id]['studentid'] }}</td>
+                        <td>{{ users[user_id]['student_id'] }}</td>
 
                         {% for question in questions %}
                             <td>