Skip to content

Commit

Permalink
black
Browse files Browse the repository at this point in the history
  • Loading branch information
fantix committed Sep 25, 2019
1 parent 7fe369b commit a5fbcd4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
6 changes: 2 additions & 4 deletions fence/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,9 @@ def _setup_oidc_clients(app):
)

# Add OIDC client for Synapse if configured.
if 'synapse' in oidc:
if "synapse" in oidc:
app.synapse_client = SynapseClient(
oidc["synapse"],
HTTP_PROXY=config.get("HTTP_PROXY"),
logger=logger,
oidc["synapse"], HTTP_PROXY=config.get("HTTP_PROXY"), logger=logger
)

# Add OIDC client for Microsoft if configured.
Expand Down
23 changes: 14 additions & 9 deletions fence/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
Text,
MetaData,
Table,
text)
text,
)
from sqlalchemy.dialects.postgresql import ARRAY, JSONB
from sqlalchemy.orm import relationship, backref
from sqlalchemy.sql import func
Expand Down Expand Up @@ -691,15 +692,14 @@ def migrate(driver):

add_column_if_not_exist(
table_name=User.__tablename__,
column=Column(
"additional_info", JSONB(), server_default=text("'{}'")
),
column=Column("additional_info", JSONB(), server_default=text("'{}'")),
driver=driver,
metadata=md,
)

with driver.session as session:
session.execute("""\
session.execute(
"""\
CREATE OR REPLACE FUNCTION process_user_audit() RETURNS TRIGGER AS $user_audit$
BEGIN
IF (TG_OP = 'DELETE') THEN
Expand All @@ -717,14 +717,19 @@ def migrate(driver):
END IF;
RETURN NULL;
END;
$user_audit$ LANGUAGE plpgsql;""")
$user_audit$ LANGUAGE plpgsql;"""
)

exist = session.scalar(
"SELECT exists (SELECT * FROM pg_trigger WHERE tgname = 'user_audit')")
session.execute(("DROP TRIGGER user_audit ON \"User\"; " if exist else "") + """\
"SELECT exists (SELECT * FROM pg_trigger WHERE tgname = 'user_audit')"
)
session.execute(
('DROP TRIGGER user_audit ON "User"; ' if exist else "")
+ """\
CREATE TRIGGER user_audit
AFTER INSERT OR UPDATE OR DELETE ON "User"
FOR EACH ROW EXECUTE PROCEDURE process_user_audit();""")
FOR EACH ROW EXECUTE PROCEDURE process_user_audit();"""
)


def add_foreign_key_column_if_not_exist(
Expand Down

0 comments on commit a5fbcd4

Please sign in to comment.