From 61738dde9eeb49719d8a7eee993ed912153976c1 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Mon, 5 Nov 2018 13:15:53 -0800 Subject: [PATCH] Run query on DB --- .travis.yml | 2 +- lemur/migrations/versions/ee827d1e1974_.py | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3138c4e..35323b5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ env: before_script: - psql -c "create database lemur;" -U postgres - psql -c "create user lemur with password 'lemur;'" -U postgres - - psql -c "create extension pg_trgm with schema pg_catalog;" -U postgres + - psql lemur -c "create extension IF NOT EXISTS pg_trgm with schema pg_catalog;" -U postgres - npm config set registry https://registry.npmjs.org - npm install -g bower - pip install --upgrade setuptools diff --git a/lemur/migrations/versions/ee827d1e1974_.py b/lemur/migrations/versions/ee827d1e1974_.py index 26f7cea4..62ac6222 100644 --- a/lemur/migrations/versions/ee827d1e1974_.py +++ b/lemur/migrations/versions/ee827d1e1974_.py @@ -14,12 +14,8 @@ from alembic import op from sqlalchemy.exc import ProgrammingError def upgrade(): - try: - connection = op.get_bind() - connection.execute("CREATE EXTENSION pg_trgm") - except ProgrammingError as e: - # Extension is most likely already enabled - connection.execute("ROLLBACK") + connection = op.get_bind() + connection.execute("CREATE EXTENSION IF NOT EXISTS pg_trgm") op.create_index('ix_certificates_cn', 'certificates', ['cn'], unique=False, postgresql_ops={'cn': 'gin_trgm_ops'}, postgresql_using='gin')