Add a test for FTS indexes upgraded from old buggy versions

Author: msullivan

.github/scripts/patches/create-databases.py

@@ -1,6 +1,8 @@
 # Create databases on the older edgedb version
 
 import edgedb
+
+import os
 import subprocess
 import sys
 
@@ -10,13 +12,27 @@
 ]
 proc = subprocess.Popen(cmd)
 
+def migrate(con, filename):
+    with open(os.path.join("tests/schemas/", filename)) as f:
+        body = f.read()
+    con.execute(f'''
+        START MIGRATION TO {{
+            module default {{
+                {body}
+            }}
+        }};
+        POPULATE MIGRATION;
+        COMMIT MIGRATION;
+    ''')
+
+
 try:
     db = edgedb.create_client(
         host='localhost', port=10000, tls_security='insecure'
     )
     for name in [
         'json', 'functions', 'expressions', 'casts', 'policies', 'vector',
-        'scope', 'httpextauth', 'extai'
+        'scope', 'httpextauth', 'extai', 'ftsregression'
     ]:
         db.execute(f'create database {name};')
 
@@ -25,17 +41,7 @@
     db2 = edgedb.create_client(
         host='localhost', port=10000, tls_security='insecure', database='scope'
     )
-    with open("tests/schemas/cards.esdl") as f:
-        body = f.read()
-    db2.execute(f'''
-        START MIGRATION TO {{
-            module default {{
-                {body}
-            }}
-        }};
-        POPULATE MIGRATION;
-        COMMIT MIGRATION;
-    ''')
+    migrate(db2, "cards.esdl")
 
     # Put something in the query cache
     db2.query(r'''
@@ -48,6 +54,13 @@
 
     db2.close()
 
+    db2 = edgedb.create_client(
+        host='localhost', port=10000, tls_security='insecure',
+        database='ftsregression'
+    )
+    migrate(db2, "fts_regression.esdl")
+    db2.close()
+
     # Compile a query from the CLI.
     # (At one point, having a cached query with proto version 1 caused
     # trouble...)

.github/workflows.src/tests-patches.tpl.yml

@@ -62,7 +62,7 @@ jobs:
         # has timeouts.
         edb server --bootstrap-only --data-dir test-dir
         # Should we run *all* the tests?
-        edb test -j2 -v --data-dir test-dir tests/test_edgeql_json.py tests/test_edgeql_casts.py tests/test_edgeql_functions.py tests/test_edgeql_expressions.py tests/test_edgeql_policies.py tests/test_edgeql_vector.py tests/test_edgeql_scope.py tests/test_http_ext_auth.py tests/test_ext_ai.py
+        edb test -j2 -v --data-dir test-dir tests/test_edgeql_json.py tests/test_edgeql_casts.py tests/test_edgeql_functions.py tests/test_edgeql_expressions.py tests/test_edgeql_policies.py tests/test_edgeql_vector.py tests/test_edgeql_scope.py tests/test_http_ext_auth.py tests/test_ext_ai.py tests/test_edgeql_data_migration.py
 
     - name: Test downgrading a database after an upgrade
       if: ${{ !contains(matrix.edgedb-version, '-rc') && !contains(matrix.edgedb-version, '-beta') }}

.github/workflows/tests-patches.yml

@@ -0,0 +1,26 @@
+#
+# This source file is part of the EdgeDB open source project.
+#
+# Copyright 2016-present MagicStack Inc. and the EdgeDB authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+abstract type Named {
+    index fts::index on (
+        std::fts::with_options(
+            .name, language := std::fts::Language.eng));
+    required name: std::str;
+};
+
+type Project0 extending Named;

tests/schemas/fts_regression.esdl

@@ -13334,3 +13334,63 @@ async def test_edgeql_migration_rewrite_raw_02(self):
             await self.con.execute(r"""
                 create applied migration { }
             """)
+
+
+class TestEdgeQLFtsRegression(EdgeQLDataMigrationTestCase):
+    PARALLELISM_GRANULARITY = 'default'
+
+    SCHEMA = os.path.join(os.path.dirname(__file__), 'schemas',
+                          'fts_regression.esdl')
+
+    DEFAULT_MODULE = 'default'
+
+    async def test_edgeql_fts_regression_01(self):
+        await self.start_migration('''
+            abstract type Named {
+                index std::fts::index on (
+                    std::fts::with_options(
+                        .name, language := std::fts::Language.eng));
+                required name: std::str;
+            };
+
+            type Project0 extending Named;
+        ''', module='default')
+
+        # no changes
+        await self.assert_describe_migration({
+            'confirmed': [],
+            'complete': True,
+        })
+
+
+    async def test_edgeql_fts_regression_02(self):
+        await self.migrate('''
+            abstract type Named {
+                index fts::index on (
+                    fts::with_options(
+                        .name, language := std::fts::Language.eng));
+                required name: std::str;
+            };
+
+            type Project0 extending Named;
+            type Project1 extending Named {
+              overloaded name {
+                constraint exclusive;
+              }
+            };
+        ''', module='default')
+
+        await self.migrate('', module='default')
+
+    async def test_edgeql_fts_regression_03(self):
+        await self.migrate('', module='default')
+
+    async def test_edgeql_fts_regression_04(self):
+        await self.assert_query_result(
+            '''
+            select schema::Index { name }
+            filter exists .<indexes[is schema::ObjectType]
+            and .name like '%index';
+            ''',
+            [{"name": "std::fts::index"}, {"name": "std::fts::index"}]
+        )