diff --git a/tests/schema/test_generate_schema.py b/tests/schema/test_generate_schema.py index 40272d8e2..269045f45 100644 --- a/tests/schema/test_generate_schema.py +++ b/tests/schema/test_generate_schema.py @@ -726,8 +726,8 @@ async def test_index_safe(self): `full_text` LONGTEXT NOT NULL, `geometry` GEOMETRY NOT NULL ) CHARACTER SET utf8mb4; -CREATE FULLTEXT INDEX IF NOT EXISTS `idx_index_full_te_3caba4` ON `index` (`full_text`) WITH PARSER ngram; -CREATE SPATIAL INDEX IF NOT EXISTS `idx_index_geometr_0b4dfb` ON `index` (`geometry`);""", +CREATE FULLTEXT INDEX `idx_index_full_te_3caba4` ON `index` (`full_text`) WITH PARSER ngram; +CREATE SPATIAL INDEX `idx_index_geometr_0b4dfb` ON `index` (`geometry`);""", ) async def test_index_unsafe(self): @@ -1102,7 +1102,7 @@ async def test_index_unsafe(self): CREATE INDEX "idx_index_gist_c807bf" ON "index" USING GIST ("gist"); CREATE INDEX "idx_index_sp_gist_2c0bad" ON "index" USING SPGIST ("sp_gist"); CREATE INDEX "idx_index_hash_cfe6b5" ON "index" USING HASH ("hash"); -CREATE INDEX "idx_index_partial_c5be6a" ON "index" USING ("partial") WHERE id = 1;""", +CREATE INDEX "idx_index_partial_c5be6a" ON "index" USING ("partial") WHERE id = 1;""", ) async def test_index_safe(self): @@ -1126,7 +1126,7 @@ async def test_index_safe(self): CREATE INDEX IF NOT EXISTS "idx_index_gist_c807bf" ON "index" USING GIST ("gist"); CREATE INDEX IF NOT EXISTS "idx_index_sp_gist_2c0bad" ON "index" USING SPGIST ("sp_gist"); CREATE INDEX IF NOT EXISTS "idx_index_hash_cfe6b5" ON "index" USING HASH ("hash"); -CREATE INDEX IF NOT EXISTS "idx_index_partial_c5be6a" ON "index" USING ("partial") WHERE id = 1;""", +CREATE INDEX IF NOT EXISTS "idx_index_partial_c5be6a" ON "index" USING ("partial") WHERE id = 1;""", ) async def test_m2m_no_auto_create(self): diff --git a/tests/testmodels.py b/tests/testmodels.py index 1e2c7dcf6..723b88c54 100644 --- a/tests/testmodels.py +++ b/tests/testmodels.py @@ -17,6 +17,7 @@ from tortoise import fields from tortoise.exceptions import ValidationError from tortoise.fields import NO_ACTION +from tortoise.indexes import Index from tortoise.manager import Manager from tortoise.models import Model from tortoise.queryset import QuerySet @@ -150,6 +151,9 @@ class ModelTestPydanticMetaBackwardRelations3(Model): class Node(Model): name = fields.CharField(max_length=10) + class Meta: + indexes = [Index(fields=("name",))] + class Tree(Model): parent: fields.ForeignKeyRelation[Node] = fields.ForeignKeyField( diff --git a/tests/utils/test_describe_model.py b/tests/utils/test_describe_model.py index 998d6e794..a25d114b2 100644 --- a/tests/utils/test_describe_model.py +++ b/tests/utils/test_describe_model.py @@ -25,12 +25,19 @@ ManyToManyFieldInstance, OneToOneFieldInstance, ) +from tortoise.indexes import Index + + +def dump_index(obj): + if isinstance(obj, Index): + return repr(obj) + return obj class TestDescribeModels(test.TestCase): def test_describe_models_all_serializable(self): val = Tortoise.describe_models() - json.dumps(val) + json.dumps(val, default=dump_index) self.assertIn("models.SourceFields", val.keys()) self.assertIn("models.Event", val.keys()) diff --git a/tortoise/backends/mysql/executor.py b/tortoise/backends/mysql/executor.py index 0ab40a19c..6a19be073 100644 --- a/tortoise/backends/mysql/executor.py +++ b/tortoise/backends/mysql/executor.py @@ -1,6 +1,6 @@ import enum -from pypika_tortoise import functions, SqlContext +from pypika_tortoise import SqlContext, functions from pypika_tortoise.enums import SqlTypes from pypika_tortoise.functions import Cast, Coalesce from pypika_tortoise.terms import BasicCriterion, Criterion diff --git a/tortoise/indexes.py b/tortoise/indexes.py index b3be63da5..c503fb8bb 100644 --- a/tortoise/indexes.py +++ b/tortoise/indexes.py @@ -59,11 +59,11 @@ def get_sql( ctx = schema_generator.client.query_class.SQL_CONTEXT expressions = [f"({expression.get_sql(ctx)})" for expression in self.expressions] fields = ", ".join(expressions) - + exists = "IF NOT EXISTS " if safe and schema_generator.DIALECT != "mysql" else "" return self.INDEX_CREATE_TEMPLATE.format( - exists="IF NOT EXISTS " if safe else "", + exists=exists, index_name=schema_generator.quote(self.index_name(schema_generator, model)), - index_type=f" {self.INDEX_TYPE} ", + index_type=f" {self.INDEX_TYPE} " if self.INDEX_TYPE else " ", table_name=schema_generator.quote(model._meta.db_table), fields=fields, extra=self.extra, diff --git a/tortoise/utils.py b/tortoise/utils.py index e5c4fe0dd..8ea411b39 100644 --- a/tortoise/utils.py +++ b/tortoise/utils.py @@ -37,9 +37,8 @@ async def generate_schema_for_client(client: "BaseDBAsyncClient", safe: bool) -> :param safe: When set to true, creates the table only when it does not already exist. """ generator = client.schema_generator(client) - schema = get_schema_sql(client, safe) - logger.debug("Creating schema: %s", schema) - if schema: # pragma: nobranch + if schema := generator.get_create_schema_sql(safe): # pragma: nobranch + logger.debug("Creating schema: %s", schema) await generator.generate_from_string(schema)