Merge remote-tracking branch 'origin/Database' into auth

app/models.py

@@ -3,7 +3,6 @@ from flask_migrate import Migrate
 import enum
 
 from sqlalchemy_utils import ArrowType
-from sqlalchemy.sql.expression import func
 
 import arrow
 import random
@@ -13,12 +12,6 @@ db = SQLAlchemy()
 migrate = Migrate()
 
 
-class SubmissionType(enum.Enum):
-    worldwide = 1
-    restricted = 2
-    embargoed = 3
-
-
 class User(db.Model):
     __tablename__ = 'user'
 
@@ -27,7 +20,7 @@ class User(db.Model):
     department = db.Column(db.Text, nullable=False)
     professor = db.Column(db.Text, nullable=False)
 
-    role = db.Column(,nullable=False)
+    role = db.Column(db.Text, nullable=False)
 
     first_name = db.Column(db.Text, nullable=False)
     middle_name = db.Column(db.Text, nullable=False)
@@ -72,7 +65,7 @@ class Submission(db.Model):
     title = db.Column(db.Text)
     abstract = db.Column(db.Text)
     type = db.Column(db.Text)
-    release_type = db.Column(Enum(SubmissionType))
+    release_type = db.Column(db.Integer)
     ww_length = db.Column(db.Text)
     signature_file = db.Column(db.Text)
 

config.ini.backup

@@ -0,0 +1,14 @@
+[CONFIG]
+version = 1.0
+
+[DATABASE]
+host = localhost
+name = msstate_etd
+user = msstate_etd
+pass = password
+type = postgresql
+
+[FLASK]
+mode = default
+secret_key = SECRET_KEY_NOT_SET
+

requirements.txt

@@ -20,12 +20,14 @@ libsass==0.17.0
 Mako==1.0.7
 MarkupSafe==1.1.0
 marshmallow==2.19.1
+marshmallow-sqlalchemy==0.16.1
 passlib==1.7.1
 pycparser==2.19
 python-dateutil==2.8.0
 python-editor==1.0.4
 six==1.12.0
 SQLAlchemy==1.3.1
+SQLAlchemy-Utils==0.33.11
 webassets==0.12.1
 Werkzeug==0.14.1
 WTForms==2.2.1