Skip to content

Database diagrams editor that allows you to visualize and design your DB with a single query.

fix: export ddl index order (#1028)

Guy Ben-Aharon2d666bab0f0f
diff --git a/src/lib/data/sql-export/export-per-type/mssql.ts b/src/lib/data/sql-export/export-per-type/mssql.ts
index 1cda3621..a7afc3b4 100644
--- a/src/lib/data/sql-export/export-per-type/mssql.ts
+++ b/src/lib/data/sql-export/export-per-type/mssql.ts
@@ -228,7 +228,8 @@ export function exportMSSQL({
? `CREATE ${index.unique ? 'UNIQUE ' : ''}INDEX ${indexName}\nON ${tableName} (${indexFields.join(', ')});`
: '';
})
- .filter(Boolean);
+ .filter(Boolean)
+ .sort((a, b) => a.localeCompare(b)); // Sort for consistent output
return validIndexes.length > 0
? `\n-- Indexes\n${validIndexes.join('\n')}`
diff --git a/src/lib/data/sql-export/export-per-type/mysql.ts b/src/lib/data/sql-export/export-per-type/mysql.ts
index 4da2ec57..c5af6547 100644
--- a/src/lib/data/sql-export/export-per-type/mysql.ts
+++ b/src/lib/data/sql-export/export-per-type/mysql.ts
@@ -418,7 +418,8 @@ export function exportMySQL({
? `CREATE ${index.unique ? 'UNIQUE ' : ''}INDEX ${indexName} ON ${tableName} (${indexFieldsWithPrefix.join(', ')});`
: '';
})
- .filter(Boolean);
+ .filter(Boolean)
+ .sort((a, b) => a.localeCompare(b)); // Sort for consistent output
return validIndexes.length > 0
? `\n-- Indexes\n${validIndexes.join('\n')}`
diff --git a/src/lib/data/sql-export/export-per-type/postgresql.ts b/src/lib/data/sql-export/export-per-type/postgresql.ts
index dc291f2a..5484e7fc 100644
--- a/src/lib/data/sql-export/export-per-type/postgresql.ts
+++ b/src/lib/data/sql-export/export-per-type/postgresql.ts
@@ -421,7 +421,8 @@ export function exportPostgreSQL({
? `CREATE ${index.unique ? 'UNIQUE ' : ''}INDEX ${indexName} ON ${tableName}${index.type && index.type !== 'btree' ? ` USING ${index.type.toUpperCase()}` : ''} (${indexFieldNames.join(', ')});`
: '';
})
- .filter(Boolean);
+ .filter(Boolean)
+ .sort((a, b) => a.localeCompare(b)); // Sort for consistent output
return validIndexes.length > 0
? `\n-- Indexes\n${validIndexes.join('\n')}`
diff --git a/src/lib/data/sql-export/export-per-type/sqlite.ts b/src/lib/data/sql-export/export-per-type/sqlite.ts
index 96e69727..d136b69e 100644
--- a/src/lib/data/sql-export/export-per-type/sqlite.ts
+++ b/src/lib/data/sql-export/export-per-type/sqlite.ts
@@ -444,7 +444,8 @@ export function exportSQLite({
? `CREATE ${index.unique ? 'UNIQUE ' : ''}INDEX IF NOT EXISTS "${safeIndexName}"\nON ${tableName} (${indexFieldNames.join(', ')});`
: '';
})
- .filter(Boolean);
+ .filter(Boolean)
+ .sort((a, b) => a.localeCompare(b)); // Sort for consistent output
return validIndexes.length > 0
? `\n-- Indexes\n${validIndexes.join('\n')}`
diff --git a/src/lib/data/sql-export/export-sql-script.ts b/src/lib/data/sql-export/export-sql-script.ts
index 2ab316d7..dc846459 100644
--- a/src/lib/data/sql-export/export-sql-script.ts
+++ b/src/lib/data/sql-export/export-sql-script.ts
@@ -540,7 +540,9 @@ export const exportBaseSQL = ({
}
});
- // Generate SQL for indexes
+ // Generate SQL for indexes - collect, then sort by the full CREATE INDEX statement
+ const indexStatements: string[] = [];
+
table.indexes.forEach((index) => {
// Skip the primary key index (it's already handled as a constraint)
if (index.isPrimaryKey) {
@@ -582,9 +584,18 @@ export const exportBaseSQL = ({
const indexName = needsQuoting
? `"${rawIndexName}"`
: rawIndexName;
- sqlScript += `CREATE ${index.unique ? 'UNIQUE ' : ''}INDEX ${indexName} ON ${tableName} (${fieldNames});\n`;
+ indexStatements.push(
+ `CREATE ${index.unique ? 'UNIQUE ' : ''}INDEX ${indexName} ON ${tableName} (${fieldNames});`
+ );
}
});
+
+ // Sort index statements alphabetically for consistent, deterministic output
+ indexStatements.sort((a, b) => a.localeCompare(b));
+ sqlScript += indexStatements.join('\n');
+ if (indexStatements.length > 0) {
+ sqlScript += '\n';
+ }
});
if (nonViewTables.length > 0 && (relationships?.length ?? 0) > 0) {
diff --git a/src/lib/dbml/dbml-export/__tests__/cases/1.dbml b/src/lib/dbml/dbml-export/__tests__/cases/1.dbml
index 8439e9c7..34fa0d4a 100644
--- a/src/lib/dbml/dbml-export/__tests__/cases/1.dbml
+++ b/src/lib/dbml/dbml-export/__tests__/cases/1.dbml
@@ -2973,9 +2973,9 @@ Table "data"."Products_20" {
"field_32" text
Indexes {
+ geom [name: "idx_Products_20_3"]
updated_at [unique, name: "idx_Products_20_1"]
updated_at [unique, name: "idx_Products_20_2"]
- geom [name: "idx_Products_20_3"]
}
}
@@ -6449,8 +6449,8 @@ Table "admin"."Transactions_2" {
"amount" nvarchar(500)
Indexes {
- updated_at [unique, name: "idx_Transactions_2_1"]
geom [name: "idx_Transactions_2_2"]
+ updated_at [unique, name: "idx_Transactions_2_1"]
}
}
@@ -6802,8 +6802,8 @@ Table "admin"."Transactions_14" {
"field_65" date
Indexes {
- updated_at [unique, name: "idx_Transactions_14_1"]
geom [name: "idx_Transactions_14_2"]
+ updated_at [unique, name: "idx_Transactions_14_1"]
}
}
diff --git a/src/lib/dbml/dbml-export/__tests__/cases/8.dbml b/src/lib/dbml/dbml-export/__tests__/cases/8.dbml
index 7c401259..1f00d4d3 100644
--- a/src/lib/dbml/dbml-export/__tests__/cases/8.dbml
+++ b/src/lib/dbml/dbml-export/__tests__/cases/8.dbml
@@ -12,8 +12,8 @@ Table "pokemon"."pokemon_abilities" {
Indexes {
(pok_id, slot) [pk]
- is_hidden [name: "pokemon_abilities_pokemon_ix_pokemon_abilities_is_hidden"]
abil_id [name: "pokemon_abilities_pokemon_abil_id"]
+ is_hidden [name: "pokemon_abilities_pokemon_ix_pokemon_abilities_is_hidden"]
}
}
diff --git a/src/lib/dbml/dbml-export/__tests__/cases/8.inline.dbml b/src/lib/dbml/dbml-export/__tests__/cases/8.inline.dbml
index 75f27566..fe8cc04f 100644
--- a/src/lib/dbml/dbml-export/__tests__/cases/8.inline.dbml
+++ b/src/lib/dbml/dbml-export/__tests__/cases/8.inline.dbml
@@ -12,8 +12,8 @@ Table "pokemon"."pokemon_abilities" {
Indexes {
(pok_id, slot) [pk]
- is_hidden [name: "pokemon_abilities_pokemon_ix_pokemon_abilities_is_hidden"]
abil_id [name: "pokemon_abilities_pokemon_abil_id"]
+ is_hidden [name: "pokemon_abilities_pokemon_ix_pokemon_abilities_is_hidden"]
}
}