diff --git a/mci_database/db/migrations/README b/mci_database/db/alembic/README similarity index 100% rename from mci_database/db/migrations/README rename to mci_database/db/alembic/README diff --git a/mci_database/db/migrations/__init__.py b/mci_database/db/alembic/__init__.py similarity index 100% rename from mci_database/db/migrations/__init__.py rename to mci_database/db/alembic/__init__.py diff --git a/mci_database/db/migrations/alembic.ini b/mci_database/db/alembic/alembic.ini similarity index 94% rename from mci_database/db/migrations/alembic.ini rename to mci_database/db/alembic/alembic.ini index f8ed480..8fee37b 100644 --- a/mci_database/db/migrations/alembic.ini +++ b/mci_database/db/alembic/alembic.ini @@ -1,6 +1,7 @@ # A generic, single database configuration. [alembic] +script_location = alembic # template used to generate migration files # file_template = %%(rev)s_%%(slug)s @@ -42,4 +43,4 @@ formatter = generic [formatter_generic] format = %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %H:%M:%S +datefmt = %H:%M:%S \ No newline at end of file diff --git a/mci_database/db/migrations/env.py b/mci_database/db/alembic/env.py similarity index 100% rename from mci_database/db/migrations/env.py rename to mci_database/db/alembic/env.py diff --git a/mci_database/db/migrations/script.py.mako b/mci_database/db/alembic/script.py.mako similarity index 100% rename from mci_database/db/migrations/script.py.mako rename to mci_database/db/alembic/script.py.mako diff --git a/mci_database/db/migrations/versions/3187a44ef222_.py b/mci_database/db/alembic/versions/3187a44ef222_.py similarity index 100% rename from mci_database/db/migrations/versions/3187a44ef222_.py rename to mci_database/db/alembic/versions/3187a44ef222_.py diff --git a/mci_database/db/migrations/versions/5104693f69bb_.py b/mci_database/db/alembic/versions/5104693f69bb_.py similarity index 100% rename from mci_database/db/migrations/versions/5104693f69bb_.py rename to mci_database/db/alembic/versions/5104693f69bb_.py diff --git a/mci_database/db/migrations/versions/7da08ea50a5a_.py b/mci_database/db/alembic/versions/7da08ea50a5a_.py similarity index 100% rename from mci_database/db/migrations/versions/7da08ea50a5a_.py rename to mci_database/db/alembic/versions/7da08ea50a5a_.py diff --git a/mci_database/db/migrations/versions/9b523b424b1d_.py b/mci_database/db/alembic/versions/9b523b424b1d_.py similarity index 100% rename from mci_database/db/migrations/versions/9b523b424b1d_.py rename to mci_database/db/alembic/versions/9b523b424b1d_.py diff --git a/mci_database/db/migrations/versions/__init__.py b/mci_database/db/alembic/versions/__init__.py similarity index 100% rename from mci_database/db/migrations/versions/__init__.py rename to mci_database/db/alembic/versions/__init__.py diff --git a/mci_database/db/migrations/versions/c6c3719e2f79_.py b/mci_database/db/alembic/versions/c6c3719e2f79_.py similarity index 100% rename from mci_database/db/migrations/versions/c6c3719e2f79_.py rename to mci_database/db/alembic/versions/c6c3719e2f79_.py diff --git a/mci_database/db/migrations/versions/e1bdd0f39e93_.py b/mci_database/db/alembic/versions/e1bdd0f39e93_.py similarity index 100% rename from mci_database/db/migrations/versions/e1bdd0f39e93_.py rename to mci_database/db/alembic/versions/e1bdd0f39e93_.py diff --git a/mci_database/db/models/models.py b/mci_database/db/models/models.py index 47bbb0c..7168f52 100644 --- a/mci_database/db/models/models.py +++ b/mci_database/db/models/models.py @@ -150,6 +150,10 @@ class Individual(db.Model): telephone (str): Individual's telephone number. + telephone_2 (str): Indvidual's second known number. + + telephone_3 (str): Individual's third known number. + """ mci_id = db.Column(db.String(40), primary_key=True) vendor_id = db.Column(db.String(40)) @@ -163,6 +167,8 @@ class Individual(db.Model): date_of_birth = db.Column(db.Date, nullable=False) email_address = db.Column(db.String(100)) telephone = db.Column(db.String(20)) + telephone_2 = db.Column(db.String(20)) + telephone_3 = db.Column(db.String(20)) mailing_address_id = db.Column( db.Integer, db.ForeignKey(Address.id, ondelete='CASCADE')) gender_id = db.Column(db.Integer, db.ForeignKey( @@ -189,6 +195,8 @@ def __init__(self, date_of_birth=None, email_address=None, telephone=None, + telephone_2=None, + telephone_3=None, dispositions=None): self.mci_id = MasterClientIDFactory.get_id() self.vendor_id = vendor_id @@ -201,6 +209,8 @@ def __init__(self, self.date_of_birth = date_of_birth self.email_address = email_address self.telephone = telephone + self.telephone_2 = telephone_2 + self.telephone_3 = telephone_3 @property def as_dict(self):