Merge pull request #3402 from KeyboardNerd/QUAY-1358

Change pg_trgm to be a precondition of pgsql database

data/database.py

@@ -30,6 +30,7 @@ from data.fields import (ResumableSHA256Field, ResumableSHA1Field, JSONField, Ba
 from data.text import match_mysql, match_like
 from data.read_slave import ReadSlaveModel
 from util.names import urn_generator
+from util.validation import validate_postgres_precondition
 
 
 logger = logging.getLogger(__name__)
@@ -70,6 +71,12 @@ SCHEME_RANDOM_FUNCTION = {
 }
 
 
+PRECONDITION_VALIDATION = {
+  'postgresql': validate_postgres_precondition,
+  'postgresql+psycopg2': validate_postgres_precondition,
+}
+
+
 _EXTRA_ARGS = {
   'mysql': dict(charset='utf8mb4'),
   'mysql+pymysql': dict(charset='utf8mb4'),
@@ -284,6 +291,25 @@ def validate_database_url(url, db_kwargs, connect_timeout=5):
       pass
 
 
+def validate_database_precondition(url, db_kwargs, connect_timeout=5):
+  """ Validates that we can connect to the given database URL and the database meets our
+      precondition. Raises an exception if the validation fails. """
+  db_kwargs = db_kwargs.copy()
+  try:
+    driver = _db_from_url(url, db_kwargs, connect_timeout=connect_timeout, allow_retry=False,
+                          allow_pooling=False)
+    driver.connect()
+    pre_condition_check = PRECONDITION_VALIDATION.get(make_url(url).drivername)
+    if pre_condition_check:
+      pre_condition_check(driver)
+
+  finally:
+    try:
+      driver.close()
+    except:
+      pass
+
+
 def _wrap_for_retry(driver):
   return type('Retrying' + driver.__class__.__name__, (RetryOperationalError, driver), {})
 

data/migrations/versions/e2894a3a3c19_add_full_text_search_indexing_for_repo_.py

@@ -15,9 +15,6 @@ import sqlalchemy as sa
 from sqlalchemy.dialects import mysql
 
 def upgrade(tables, tester):
-    if op.get_bind().engine.name == 'postgresql':
-      op.execute('CREATE EXTENSION IF NOT EXISTS pg_trgm')
-
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_index('repository_description__fulltext', 'repository', ['description'], unique=False, postgresql_using='gin', postgresql_ops={'description': 'gin_trgm_ops'}, mysql_prefix='FULLTEXT')
     op.create_index('repository_name__fulltext', 'repository', ['name'], unique=False, postgresql_using='gin', postgresql_ops={'name': 'gin_trgm_ops'}, mysql_prefix='FULLTEXT')