diff --git a/web/migrations/versions/09d53fca90c7_.py b/web/migrations/versions/09d53fca90c7_.py index cc5ffbe77..e664aa128 100644 --- a/web/migrations/versions/09d53fca90c7_.py +++ b/web/migrations/versions/09d53fca90c7_.py @@ -15,12 +15,11 @@ Create Date: 2017-03-13 12:27:30.543908 """ import base64 - -import sys -from alembic import op -from pgadmin.model import db, Server -import config import os +import sys + +import config +from pgadmin.model import db, Server from pgadmin.setup import get_version # revision identifiers, used by Alembic. diff --git a/web/migrations/versions/3c1e4b6eda55_.py b/web/migrations/versions/3c1e4b6eda55_.py index 308e9ebee..cd9bf67a6 100644 --- a/web/migrations/versions/3c1e4b6eda55_.py +++ b/web/migrations/versions/3c1e4b6eda55_.py @@ -6,15 +6,8 @@ Revises: 09d53fca90c7 Create Date: 2017-06-13 17:05:30.671859 """ -import base64 - -import sys -from alembic import op -from pgadmin.model import db, Server -import config -import os -from pgadmin.setup import get_version +from pgadmin.model import db # revision identifiers, used by Alembic. revision = '3c1e4b6eda55' @@ -24,8 +17,6 @@ depends_on = None def upgrade(): - verison = get_version() - db.engine.execute( 'ALTER TABLE server ADD COLUMN hostaddr TEXT(1024)' ) diff --git a/web/migrations/versions/d85a62333272_.py b/web/migrations/versions/d85a62333272_.py index 54da9d06e..0b16faf93 100644 --- a/web/migrations/versions/d85a62333272_.py +++ b/web/migrations/versions/d85a62333272_.py @@ -6,8 +6,6 @@ Revises: 3c1e4b6eda55 Create Date: 2017-07-07 16:03:23.842734 """ -from alembic import op -import sqlalchemy as sa from pgadmin.model import db diff --git a/web/migrations/versions/f195f9a4923d_.py b/web/migrations/versions/f195f9a4923d_.py index 4bb31ced3..c77f40af6 100644 --- a/web/migrations/versions/f195f9a4923d_.py +++ b/web/migrations/versions/f195f9a4923d_.py @@ -6,13 +6,11 @@ Revises: 3c1e4b6eda55 Create Date: 2017-06-15 17:18:50.667139 """ +import config from flask import current_app from flask_security import Security, SQLAlchemyUserDatastore from flask_security.utils import verify_and_update_password - from pgadmin.model import Keys, db, User, Role -import config - # revision identifiers, used by Alembic. revision = 'f195f9a4923d' diff --git a/web/migrations/versions/fdc58d9bd449_.py b/web/migrations/versions/fdc58d9bd449_.py index a864e6072..b3898b9c0 100644 --- a/web/migrations/versions/fdc58d9bd449_.py +++ b/web/migrations/versions/fdc58d9bd449_.py @@ -14,18 +14,17 @@ Revises: Create Date: 2017-03-13 11:15:16.401139 """ -from alembic import op import base64 +import os + +import config +import sqlalchemy as sa +from alembic import op from flask import current_app from flask_security import Security, SQLAlchemyUserDatastore from flask_security.utils import encrypt_password -import os -import sqlalchemy as sa - -import config from pgadmin.model import db, User, Role from pgadmin.setup import get_version - from pgadmin.setup import user_info # revision identifiers, used by Alembic. diff --git a/web/pgadmin/setup/db_version.py b/web/pgadmin/setup/db_version.py index 6238c2234..53c5bdf4d 100644 --- a/web/pgadmin/setup/db_version.py +++ b/web/pgadmin/setup/db_version.py @@ -8,8 +8,6 @@ ########################################################################## from pgadmin.model import Version -import config -import sys def get_version(): @@ -18,11 +16,4 @@ def get_version(): except Exception: return -1 - if int(version.value) > int(config.SETTINGS_SCHEMA_VERSION): - print(u""" - The database schema version is {0}, whilst the version required by the \ - software is {1}. - Exiting...""".format(version.value, config.SETTINGS_SCHEMA_VERSION)) - sys.exit(1) - return version.value