Skip to content

Fix field evaluation in scaffolding #1133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 22, 2023
Merged

Fix field evaluation in scaffolding #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b99f50a
Fix nullable evaluation in scaffolding
bgrauer-atacom Aug 16, 2023
f56d80f
Fix NUMERIC, DECIMAL and CHAR evaluation in scaffolding
bgrauer-atacom Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 77 additions & 0 deletions src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/Scaffolding/ScaffoldingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

//$Authors = Jiri Cincura ([email protected])

using System.Linq;
using System.Threading.Tasks;
using FirebirdSql.EntityFrameworkCore.Firebird.Scaffolding.Internal;
using Microsoft.EntityFrameworkCore.Scaffolding;
using NUnit.Framework;
Expand All @@ -30,6 +32,81 @@ public void JustCanRun()
Assert.DoesNotThrow(() => modelFactory.Create(Connection, new DatabaseModelFactoryOptions()));
}

[Test]
public async Task ReadsNullableCorrect()
{
var tableName = "TEST_READS_IS_NULL_FROM_DOMAIN";
var columnNameNoDomainNull = "NO_DOMAIN_NULL";
var columnNameNoDomainNotNull = "NO_DOMAIN_NOT_NULL";
var columnNameDomainNull = "DOMAIN_NULL";
var columnNameDomainNotNull = "DOMAIN_NOT_NUL";

using var commandDomainNull = Connection.CreateCommand();
commandDomainNull.CommandText = "create domain DOMAIN_NULL as INTEGER";
await commandDomainNull.ExecuteNonQueryAsync();

using var commandDomainNotNull = Connection.CreateCommand();
commandDomainNotNull.CommandText = "create domain DOMAIN_NOT_NULL as INTEGER NOT NULL";
await commandDomainNotNull.ExecuteNonQueryAsync();

using var commandTable = Connection.CreateCommand();
commandTable.CommandText = $"create table {tableName} ({columnNameNoDomainNull} INTEGER, {columnNameNoDomainNotNull} INTEGER NOT NULL, {columnNameDomainNull} DOMAIN_NULL, {columnNameDomainNotNull} DOMAIN_NOT_NULL)";
await commandTable.ExecuteNonQueryAsync();

var modelFactory = GetModelFactory();
var model = modelFactory.Create(Connection.ConnectionString, new DatabaseModelFactoryOptions(new string[] { tableName }));
var table = model.Tables.Single(x => x.Name == tableName);
var columnNoDomainNull = table.Columns.Single(x => x.Name == columnNameNoDomainNull);
var columnNoDomainNotNull = table.Columns.Single(x => x.Name == columnNameNoDomainNotNull);
var columnDomainNull = table.Columns.Single(x => x.Name == columnNameDomainNull);
var columnDomainNotNull = table.Columns.Single(x => x.Name == columnNameDomainNotNull);

Assert.Multiple(() =>
{
Assert.That(columnNoDomainNull.IsNullable, Is.True);
Assert.That(columnNoDomainNotNull.IsNullable, Is.False);
Assert.That(columnDomainNull.IsNullable, Is.True);
Assert.That(columnDomainNotNull.IsNullable, Is.False);
});

}

[TestCase("SMALLINT")]
[TestCase("INTEGER")]
[TestCase("FLOAT")]
[TestCase("DATE")]
[TestCase("TIME")]
[TestCase("CHAR(12)")]
[TestCase("BIGINT")]
[TestCase("BOOLEAN")]
[TestCase("DOUBLE PRECISION")]
[TestCase("TIMESTAMP")]
[TestCase("VARCHAR(24)")]
[TestCase("BLOB SUB_TYPE TEXT")]
[TestCase("BLOB SUB_TYPE BINARY")]
[TestCase("DECIMAL(4,1)")]
[TestCase("DECIMAL(9,1)")]
[TestCase("DECIMAL(18,1)")]
[TestCase("NUMERIC(4,1)")]
[TestCase("NUMERIC(9,1)")]
[TestCase("NUMERIC(18,1)")]
public async Task ReadsCorrectFieldType(string dataType)
{
var tableName = $"TEST_READS_FIELD_TYPE_CORRECT";
var columnName = "FIELD";

using var commandTable = Connection.CreateCommand();
commandTable.CommandText = $"recreate table {tableName} ({columnName} {dataType})";
await commandTable.ExecuteNonQueryAsync();

var modelFactory = GetModelFactory();
var model = modelFactory.Create(Connection.ConnectionString, new DatabaseModelFactoryOptions(new string[] { tableName }));
var table = model.Tables.Single(x => x.Name == tableName);
var column = table.Columns.Single(x => x.Name == columnName);

Assert.That(column.StoreType, Is.EqualTo(dataType));
}

static IDatabaseModelFactory GetModelFactory()
{
return new FbDatabaseModelFactory();
Expand Down
16 changes: 11 additions & 5 deletions src/FirebirdSql.EntityFrameworkCore.Firebird/Scaffolding/Internal/FbDatabaseModelFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,27 +146,33 @@ private IEnumerable<DatabaseTable> GetTables(DbConnection connection, Func<Datab
@"SELECT
trim(RF.RDB$FIELD_NAME) as COLUMN_NAME,
COALESCE(RF.RDB$DEFAULT_SOURCE, F.RDB$DEFAULT_SOURCE) as COLUMN_DEFAULT,
COALESCE(RF.RDB$NULL_FLAG, 0) as NOT_NULL,
COALESCE(COALESCE(RF.RDB$NULL_FLAG, F.RDB$NULL_FLAG), 0) as NOT_NULL,
CASE Coalesce(F.RDB$FIELD_TYPE, 0)
WHEN 7 THEN
CASE F.RDB$FIELD_SUB_TYPE
WHEN 0 THEN 'SMALLINT'
ELSE 'DECIMAL'
WHEN 1 THEN 'NUMERIC(' || (F.RDB$FIELD_PRECISION) || ',' || ABS(F.RDB$FIELD_SCALE) || ')'
WHEN 2 THEN 'DECIMAL(' || (F.RDB$FIELD_PRECISION) || ',' || ABS(F.RDB$FIELD_SCALE) || ')'
ELSE '?'
END
WHEN 8 THEN
CASE F.RDB$FIELD_SUB_TYPE
WHEN 0 THEN 'INTEGER'
ELSE 'DECIMAL'
WHEN 1 THEN 'NUMERIC(' || (F.RDB$FIELD_PRECISION) || ',' || ABS(F.RDB$FIELD_SCALE) || ')'
WHEN 2 THEN 'DECIMAL(' || (F.RDB$FIELD_PRECISION) || ',' || ABS(F.RDB$FIELD_SCALE) || ')'
ELSE '?'
END
WHEN 9 THEN 'QUAD'
WHEN 10 THEN 'FLOAT'
WHEN 12 THEN 'DATE'
WHEN 13 THEN 'TIME'
WHEN 14 THEN 'CHAR(' || (TRUNC(F.RDB$FIELD_LENGTH / CH.RDB$BYTES_PER_CHARACTER)) || ') '
WHEN 14 THEN 'CHAR(' || (TRUNC(F.RDB$FIELD_LENGTH / CH.RDB$BYTES_PER_CHARACTER)) || ')'
WHEN 16 THEN
CASE F.RDB$FIELD_SUB_TYPE
WHEN 0 THEN 'BIGINT'
ELSE 'DECIMAL'
WHEN 1 THEN 'NUMERIC(' || (F.RDB$FIELD_PRECISION) || ',' || ABS(F.RDB$FIELD_SCALE) || ')'
WHEN 2 THEN 'DECIMAL(' || (F.RDB$FIELD_PRECISION) || ',' || ABS(F.RDB$FIELD_SCALE) || ')'
ELSE '?'
END
WHEN 23 THEN 'BOOLEAN'
WHEN 27 THEN 'DOUBLE PRECISION'
Expand Down