From 51b25b8df185212e7a7fdba43870e9b579f4929b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20de=20Ara=C3=BAjo=20Alves?= Date: Fri, 19 Jun 2026 11:16:32 -0300 Subject: [PATCH 1/2] Bump django dependency version from <6.0 to <7.0 in pyproject.toml and uv.lock --- pyproject.toml | 2 +- uv.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 252b7ac..6deef6a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ authors = [ { name = "Michel Wilhelm", email = "michelwilhelm@gmail.com" }, ] dependencies = [ - "django>=4.2,<6.0", + "django>=4.2,<7.0", ] keywords = ["django", "dbml", "schema"] classifiers = [ diff --git a/uv.lock b/uv.lock index 96fe4c0..633702e 100644 --- a/uv.lock +++ b/uv.lock @@ -50,7 +50,7 @@ dev = [ ] [package.metadata] -requires-dist = [{ name = "django", specifier = ">=4.2,<6.0" }] +requires-dist = [{ name = "django", specifier = ">=4.2,<7.0" }] [package.metadata.requires-dev] dev = [ From 7cfa759f4d8fdce0069699ee43b4745cae306bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20de=20Ara=C3=BAjo=20Alves?= Date: Wed, 19 Aug 2026 15:26:05 -0300 Subject: [PATCH 2/2] Fix field definition and index addition in SchemaBuilder; handle index field names correctly --- django_dbml/core/builder.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/django_dbml/core/builder.py b/django_dbml/core/builder.py index d064b70..adfbb1d 100644 --- a/django_dbml/core/builder.py +++ b/django_dbml/core/builder.py @@ -59,6 +59,8 @@ def _build_table(self, project: ProjectDefinition, model: type[Model]) -> None: table_to_field=field_name, ) ) + table.fields[field_name] = self.build_field_definition(project, table_name, field) + self.add_field_index(table, model, field, field_name) continue if isinstance(field, models.fields.related.ForeignKey): @@ -72,6 +74,8 @@ def _build_table(self, project: ProjectDefinition, model: type[Model]) -> None: table_to_field=field_name, ) ) + table.fields[field_name] = self.build_field_definition(project, table_name, field) + self.add_field_index(table, model, field, field_name) continue if isinstance(field, models.fields.related.ManyToManyField): @@ -220,7 +224,7 @@ def add_field_index(self, table: TableDefinition, model: type[Model], field: Fie def add_meta_indexes(self, table: TableDefinition, model: type[Model]) -> None: for index in model._meta.indexes: - column_names = [model._meta._forward_fields_map[field_name].column for field_name in index.fields] + column_names = [model._meta._forward_fields_map[field_name.lstrip("-")].column for field_name in index.fields] table.indexes.append( IndexDefinition( fields=column_names,