Commit 7b08f61

authored

Support DESC-flag in migrations and scaffolding (#126)

1 parent 87ef29e commit 7b08f61Copy full SHA for 7b08f61

File tree

+23

-2

lines changed

src/FirebirdSql.EntityFrameworkCore.Firebird
- Migrations
  - FbMigrationsSqlGenerator.cs
- Scaffolding/Internal
  - FbDatabaseModelFactory.cs

+23

-2

lines changed

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,19 @@ protected override void Generate(CreateIndexOperation operation, IModel model, M`
`201`	`201`	`{`
`202`	`202`	`builder.Append("UNIQUE ");`
`203`	`203`	`}`
	`204`	`+`
	`205`	`+ if (operation.IsDescending is not null && operation.IsDescending.Length > 0)`
	`206`	`+ {`
	`207`	`+ var isDescending = operation.IsDescending[0];`
	`208`	`+ if (operation.IsDescending.Any(x => x != isDescending))`
	`209`	`+ throw new NotSupportedException("Mixed order indices are not supported by Firebird.");`
	`210`	`+`
	`211`	`+ if (isDescending)`
	`212`	`+ {`
	`213`	`+ builder.Append("DESC ");`
	`214`	`+ }`
	`215`	`+ }`
	`216`	`+`
`204`	`217`	`IndexTraits(operation, model, builder);`
`205`	`218`	`builder.Append("INDEX ");`
`206`	`219`	`builder.Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(operation.Name));`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,7 @@ private void GetPrimaryKeys(DbConnection connection, IReadOnlyList<DatabaseTable`
`311`	`311`	`@"SELECT`
`312`	`312`	`trim(I.rdb$index_name) as INDEX_NAME,`
`313`	`313`	`COALESCE(I.rdb$unique_flag, 0) as IS_UNIQUE,`
	`314`	`+ Coalesce(I.rdb$index_type, 0) = 1 as IS_DESC,`
`314`	`315`	`list(trim(sg.RDB$FIELD_NAME)) as COLUMNS`
`315`	`316`	`FROM`
`316`	`317`	`RDB$INDICES i`
`@@ -319,7 +320,7 @@ private void GetPrimaryKeys(DbConnection connection, IReadOnlyList<DatabaseTable`
`319`	`320`	`WHERE`
`320`	`321`	`trim(i.rdb$relation_name) = '{0}'`
`321`	`322`	`GROUP BY`
`322`		`- INDEX_NAME, IS_UNIQUE ;";`
	`323`	`+ INDEX_NAME, IS_UNIQUE, IS_DESC ;";`
`323`	`324`
`324`	`325`	`/// <remarks>`
`325`	`326`	`/// Primary keys are handled as in <see cref="GetConstraints"/>, not here`
`@@ -343,11 +344,18 @@ private void GetIndexes(DbConnection connection, IReadOnlyList<DatabaseTable> ta`
`343`	`344`	`IsUnique = reader.GetBoolean(1),`
`344`	`345`	`};`
`345`	`346`
`346`		`- foreach (var column in reader.GetString(2).Split(','))`
	`347`	`+ foreach (var column in reader.GetString(3).Split(','))`
`347`	`348`	`{`
`348`	`349`	`index.Columns.Add(table.Columns.Single(y => y.Name == column.Trim()));`
`349`	`350`	`}`
`350`	`351`
	`352`	`+ if (reader.GetBoolean(2))`
	`353`	`+ {`
	`354`	`+ var isDescending = new bool[index.Columns.Count];`
	`355`	`+ isDescending.AsSpan().Fill(true);`
	`356`	`+ index.IsDescending = isDescending;`
	`357`	`+ }`
	`358`	`+`
`351`	`359`	`table.Indexes.Add(index);`
`352`	`360`	`}`
`353`	`361`	`}`

Comments

(0)