Skip to content

Commit

Permalink
refactor: code cleanups and annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
@ergo
ergo committed Nov 15, 2016
1 parent 6857739 commit 1717167
Show file tree
Hide file tree
Showing 30 changed files with 470 additions and 289 deletions.
3 changes: 2 additions & 1 deletion ziggurat_foundations/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import unicode_literals

__version__ = {'major': 0, 'minor': 6, 'patch': 8}
__version__ = {'major': 0, 'minor': 7, 'patch': 0}


class ModelProxy(object):
Expand All @@ -19,6 +19,7 @@ def __nonzero__(self):
noop = NOOP()
noparent = NOOP()


def make_passwordmanager():
from passlib.context import CryptContext
pwd_context = CryptContext(
Expand Down
1 change: 0 additions & 1 deletion ziggurat_foundations/ext/pyramid/sign_in.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import logging
import pyramid.security


from ziggurat_foundations.exc import ZigguratException
from ziggurat_foundations.models.base import get_db_session

Expand Down
4 changes: 2 additions & 2 deletions ziggurat_foundations/migrations/script.py.mako
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import sqlalchemy as sa
${imports if imports else ""}

def upgrade():
${upgrades if upgrades else "pass"}

This comment has been minimized.

Sign in to view

Copy link
@uralbash

uralbash Nov 15, 2016

Contributor

Probably it's wrong changes

This comment has been minimized.

Sign in to view

Copy link
@ergo

ergo Nov 15, 2016

Author Owner

thanks, it was auto format going rogue
${upgrades if upgrades else "pass"}

def downgrade():
${downgrades if downgrades else "pass"}

This comment has been minimized.

Sign in to view

Copy link
@uralbash

uralbash Nov 15, 2016

Contributor

Same as above

This comment has been minimized.

Sign in to view

Copy link
@ergo

ergo Nov 15, 2016

Author Owner

thanks, it was auto format going rogue
${downgrades if downgrades else "pass"}
106 changes: 65 additions & 41 deletions ziggurat_foundations/migrations/versions/20671b28c538_change_all_linking_k.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,47 +32,59 @@ def upgrade():
users_resources_permissions_pkey = 'users_resources_permissions_pkey'

# inspected keys
groups_permissions_pkey = insp.get_pk_constraint('groups_permissions')['name']
groups_permissions_pkey = insp.get_pk_constraint('groups_permissions')[
'name']
groups_pkey = insp.get_pk_constraint('groups')['name']
groups_resources_permissions_pkey = insp.get_pk_constraint('groups_resources_permissions')['name']
groups_resources_permissions_pkey = \
insp.get_pk_constraint('groups_resources_permissions')['name']
users_groups_pkey = insp.get_pk_constraint('users_groups')['name']
users_permissions_pkey = insp.get_pk_constraint('users_permissions')['name']
users_resources_permissions_pkey = insp.get_pk_constraint('users_resources_permissions')['name']


users_resources_permissions_pkey = \
insp.get_pk_constraint('users_resources_permissions')['name']

op.drop_constraint('groups_pkey', 'groups', type_='primary')

if isinstance(c.connection.engine.dialect, MySQLDialect):
op.add_column('groups', sa.Column('id', sa.Integer, primary_key=True, autoincrement=False))
op.add_column('groups', sa.Column('id', sa.Integer, primary_key=True,
autoincrement=False))
op.create_primary_key(groups_pkey, 'groups', cols=['id'])
op.alter_column('groups', 'id', type_=sa.Integer, existing_type=sa.Integer, autoincrement=True,
op.alter_column('groups', 'id', type_=sa.Integer,
existing_type=sa.Integer, autoincrement=True,
existing_autoincrement=False, nullable=False)
else:
op.add_column('groups', sa.Column('id', sa.Integer, primary_key=True, autoincrement=True))
op.add_column('groups', sa.Column('id', sa.Integer, primary_key=True,
autoincrement=True))
op.create_primary_key(groups_pkey, 'groups', cols=['id'])

if isinstance(c.connection.engine.dialect, MySQLDialect):
for t in ['groups_permissions', 'groups_resources_permissions', 'users_groups']:
for t in ['groups_permissions', 'groups_resources_permissions',
'users_groups']:
for constraint in insp.get_foreign_keys(t):
if constraint['referred_columns'] == ['group_name']:
op.drop_constraint(constraint['name'], t, type_='foreignkey')
op.drop_constraint(constraint['name'], t,
type_='foreignkey')

for t in ['users_resources_permissions', 'users_permissions', 'users_groups']:
for t in ['users_resources_permissions', 'users_permissions',
'users_groups']:
for constraint in insp.get_foreign_keys(t):
if constraint['referred_columns'] == ['user_name']:
op.drop_constraint(constraint['name'], t, type_='foreignkey')
op.drop_constraint(constraint['name'], t,
type_='foreignkey')

for constraint in insp.get_foreign_keys('resources'):
if constraint['referred_columns'] in [['user_name'], ['group_name']]:
op.drop_constraint(constraint['name'], 'resources', type_='foreignkey')
if constraint['referred_columns'] in [['user_name'],
['group_name']]:
op.drop_constraint(constraint['name'], 'resources',
type_='foreignkey')

op.add_column('resources', sa.Column('owner_user_id', sa.Integer(),
sa.ForeignKey('users.id', onupdate='CASCADE',
ondelete='SET NULL')))
sa.ForeignKey('users.id',
onupdate='CASCADE',
ondelete='SET NULL')))
op.add_column('resources', sa.Column('owner_group_id', sa.Integer(),
sa.ForeignKey('groups.id', onupdate='CASCADE',
ondelete='SET NULL')))
sa.ForeignKey('groups.id',
onupdate='CASCADE',
ondelete='SET NULL')))
# update the data
op.execute('''update resources set owner_user_id =
(select id from users where users.user_name=owner_user_name)''')
Expand All @@ -85,13 +97,15 @@ def upgrade():
op.add_column('groups_permissions', sa.Column('group_id', sa.Integer()))
else:
op.add_column('groups_permissions', sa.Column('group_id', sa.Integer(),
sa.ForeignKey('groups.id', onupdate='CASCADE',
ondelete='CASCADE')))
sa.ForeignKey('groups.id',
onupdate='CASCADE',
ondelete='CASCADE')))

op.execute('''update groups_permissions set group_id =
(select id from groups where groups.group_name=groups_permissions.group_name)''')

op.drop_constraint(groups_permissions_pkey, 'groups_permissions', type_='primary')
op.drop_constraint(groups_permissions_pkey, 'groups_permissions',
type_='primary')
op.create_primary_key(groups_permissions_pkey, 'groups_permissions',
cols=['group_id', 'perm_name'])
if isinstance(c.connection.engine.dialect, MySQLDialect):
Expand All @@ -104,16 +118,19 @@ def upgrade():
op.add_column('groups_resources_permissions',
sa.Column('group_id', sa.Integer()))
else:
op.add_column('groups_resources_permissions', sa.Column('group_id', sa.Integer(),
sa.ForeignKey('groups.id', onupdate='CASCADE',
ondelete='CASCADE')))
op.add_column('groups_resources_permissions',
sa.Column('group_id', sa.Integer(),
sa.ForeignKey('groups.id', onupdate='CASCADE',
ondelete='CASCADE')))

op.execute('''update groups_resources_permissions set group_id =
(select id from groups where groups.group_name=groups_resources_permissions.group_name)''')
op.drop_constraint(groups_resources_permissions_pkey, 'groups_resources_permissions',
op.drop_constraint(groups_resources_permissions_pkey,
'groups_resources_permissions',
type_='primary')
op.create_primary_key(groups_resources_permissions_pkey, 'groups_resources_permissions',
cols=['group_id', 'resource_id' , 'perm_name'])
op.create_primary_key(groups_resources_permissions_pkey,
'groups_resources_permissions',
cols=['group_id', 'resource_id', 'perm_name'])

if isinstance(c.connection.engine.dialect, MySQLDialect):
op.create_foreign_key(None, 'groups_resources_permissions', 'groups',
Expand All @@ -125,18 +142,19 @@ def upgrade():
op.add_column('users_groups', sa.Column('group_id', sa.Integer()))
else:
op.add_column('users_groups', sa.Column('group_id', sa.Integer(),
sa.ForeignKey('groups.id', onupdate='CASCADE',
ondelete='CASCADE')))
sa.ForeignKey('groups.id',
onupdate='CASCADE',
ondelete='CASCADE')))
op.execute('''update users_groups set group_id =
(select id from groups where groups.group_name=users_groups.group_name)''')


if isinstance(c.connection.engine.dialect, MySQLDialect):
op.add_column('users_groups', sa.Column('user_id', sa.Integer()))
else:
op.add_column('users_groups', sa.Column('user_id', sa.Integer(),
sa.ForeignKey('users.id', onupdate='CASCADE',
ondelete='CASCADE')))
sa.ForeignKey('users.id',
onupdate='CASCADE',
ondelete='CASCADE')))
op.execute('''update users_groups set user_id =
(select id from users where users.user_name=users_groups.user_name)''')
op.drop_constraint(users_groups_pkey, 'users_groups', type='primary')
Expand All @@ -156,11 +174,13 @@ def upgrade():
op.add_column('users_permissions', sa.Column('user_id', sa.Integer()))
else:
op.add_column('users_permissions', sa.Column('user_id', sa.Integer(),
sa.ForeignKey('users.id', onupdate='CASCADE',
ondelete='CASCADE')))
sa.ForeignKey('users.id',
onupdate='CASCADE',
ondelete='CASCADE')))
op.execute('''update users_permissions set user_id =
(select id from groups where groups.group_name=users_permissions.user_name)''')
op.drop_constraint(users_permissions_pkey, 'users_permissions', type='primary')
op.drop_constraint(users_permissions_pkey, 'users_permissions',
type='primary')
op.create_primary_key(users_permissions_pkey, 'users_permissions',
cols=['user_id', 'perm_name'])
if isinstance(c.connection.engine.dialect, MySQLDialect):
Expand All @@ -170,17 +190,21 @@ def upgrade():
ondelete='CASCADE')

if isinstance(c.connection.engine.dialect, MySQLDialect):
op.add_column('users_resources_permissions', sa.Column('user_id', sa.Integer()))
op.add_column('users_resources_permissions',
sa.Column('user_id', sa.Integer()))
else:
op.add_column('users_resources_permissions', sa.Column('user_id', sa.Integer(),
sa.ForeignKey('users.id', onupdate='CASCADE',
ondelete='CASCADE')))
op.add_column('users_resources_permissions',
sa.Column('user_id', sa.Integer(),
sa.ForeignKey('users.id', onupdate='CASCADE',
ondelete='CASCADE')))

op.execute('''update users_resources_permissions set user_id =
(select id from users where users.user_name=users_resources_permissions.user_name)''')
op.drop_constraint(users_resources_permissions_pkey, 'users_resources_permissions',
op.drop_constraint(users_resources_permissions_pkey,
'users_resources_permissions',
type='primary')
op.create_primary_key(users_resources_permissions_pkey, 'users_resources_permissions',
op.create_primary_key(users_resources_permissions_pkey,
'users_resources_permissions',
cols=['user_id', 'resource_id', 'perm_name'])
if isinstance(c.connection.engine.dialect, MySQLDialect):
op.create_foreign_key(None, 'users_resources_permissions', 'users',
Expand Down
30 changes: 17 additions & 13 deletions ziggurat_foundations/migrations/versions/24ab8d11f014_external_identities.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,30 @@
"""
from __future__ import unicode_literals

# downgrade revision identifier, used by Alembic.
revision = '24ab8d11f014'
down_revision = '2bb1ba973f0b'

from alembic.op import *
from alembic import op
import sqlalchemy as sa


def upgrade():
create_table('external_identities',
sa.Column('external_id', sa.Unicode(255), primary_key=True),
sa.Column('external_user_name', sa.Unicode(50), default=''),
sa.Column('local_user_name', sa.Unicode(50),
sa.ForeignKey('users.user_name', onupdate='CASCADE',
ondelete='CASCADE'), primary_key=True),
sa.Column('provider_name', sa.Unicode(50), default='',
primary_key=True),
sa.Column('access_token', sa.Unicode(255), default=''),
sa.Column('alt_token', sa.Unicode(255), default=''),
sa.Column('token_secret', sa.Unicode(255), default='')
)
op.create_table('external_identities',
sa.Column('external_id', sa.Unicode(255), primary_key=True),
sa.Column('external_user_name', sa.Unicode(50), default=''),
sa.Column('local_user_name', sa.Unicode(50),
sa.ForeignKey('users.user_name',
onupdate='CASCADE',
ondelete='CASCADE'),
primary_key=True),
sa.Column('provider_name', sa.Unicode(50), default='',
primary_key=True),
sa.Column('access_token', sa.Unicode(255), default=''),
sa.Column('alt_token', sa.Unicode(255), default=''),
sa.Column('token_secret', sa.Unicode(255), default='')
)


def downgrade():
Expand Down

0 comments on commit 1717167

Please sign in to comment.