Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,12 @@ public class SqliteLoggingDefinitions : RelationalLoggingDefinitions
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public EventDefinitionBase? LogFormatWarning;

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public EventDefinitionBase? LogExpressionIndexSkipped;
}
11 changes: 10 additions & 1 deletion src/EFCore.Sqlite.Core/Diagnostics/SqliteEventId.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ private enum Id
UniqueConstraintFound = CoreEventId.ProviderDesignBaseId + 9,
InferringTypes = CoreEventId.ProviderDesignBaseId + 10,
OutOfRangeWarning = CoreEventId.ProviderDesignBaseId + 11,
FormatWarning = CoreEventId.ProviderDesignBaseId + 12
FormatWarning = CoreEventId.ProviderDesignBaseId + 12,
ExpressionIndexSkippedWarning = CoreEventId.ProviderDesignBaseId + 13
}

private static readonly string ValidationPrefix = DbLoggerCategory.Model.Validation.Name + ".";
Expand Down Expand Up @@ -257,4 +258,12 @@ private static EventId MakeScaffoldingId(Id id)
/// This event is in the <see cref="DbLoggerCategory.Scaffolding" /> category.
/// </remarks>
public static readonly EventId FormatWarning = MakeScaffoldingId(Id.FormatWarning);

/// <summary>
/// An index defined on an expression was skipped because indexes on expressions are not supported.
/// </summary>
/// <remarks>
/// This event is in the <see cref="DbLoggerCategory.Scaffolding" /> category.
/// </remarks>
public static readonly EventId ExpressionIndexSkippedWarning = MakeScaffoldingId(Id.ExpressionIndexSkippedWarning);
}
3 changes: 3 additions & 0 deletions src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@
{
"Member": "static readonly Microsoft.Extensions.Logging.EventId ConflictingValueGenerationStrategiesWarning"
},
{
"Member": "static readonly Microsoft.Extensions.Logging.EventId ExpressionIndexSkippedWarning"
},
{
"Member": "static readonly Microsoft.Extensions.Logging.EventId ForeignKeyFound"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -522,4 +522,25 @@ public static void FormatWarning(

// No DiagnosticsSource events because these are purely design-time messages
}

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public static void ExpressionIndexSkippedWarning(
this IDiagnosticsLogger<DbLoggerCategory.Scaffolding> diagnostics,
string? indexName,
string? tableName)
{
var definition = SqliteResources.LogExpressionIndexSkipped(diagnostics);

if (diagnostics.ShouldLog(definition))
{
definition.Log(diagnostics, indexName, tableName);
}

// No DiagnosticsSource events because these are purely design-time messages
}
}
25 changes: 25 additions & 0 deletions src/EFCore.Sqlite.Core/Properties/SqliteStrings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/EFCore.Sqlite.Core/Properties/SqliteStrings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@
<value>Both the SqliteValueGenerationStrategy '{generationStrategy}' and '{otherGenerationStrategy}' have been set on property '{propertyName}' on entity type '{entityName}'. Configuring two strategies is usually unintentional and will likely result in a database error.</value>
<comment>Warning SqliteEventId.ConflictingValueGenerationStrategiesWarning string string string string</comment>
</data>
<data name="LogExpressionIndexSkipped" xml:space="preserve">
<value>Skipping index '{indexName}' on table '{tableName}', since it is defined on an expression and indexes on expressions are not supported.</value>
<comment>Warning SqliteEventId.ExpressionIndexSkippedWarning string? string?</comment>
</data>
<data name="LogForeignKeyScaffoldErrorPrincipalTableNotFound" xml:space="preserve">
<value>Skipping foreign key with identity '{id}' on table '{tableName}' since principal table '{principalTableName}' was not found in the model. This usually happens when the principal table was not included in the selection set.</value>
<comment>Warning SqliteEventId.ForeignKeyReferencesMissingTableWarning string? string? string?</comment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1062,6 +1062,7 @@ ORDER BY "seq"

_logger.IndexFound(index.Name, table.Name, index.IsUnique);

var isExpressionIndex = false;
using (var command2 = connection.CreateCommand())
{
command2.CommandText =
Expand All @@ -1080,6 +1081,13 @@ ORDER BY "seqno"
using var reader2 = command2.ExecuteReader();
while (reader2.Read())
{
if (reader2.IsDBNull(0))
{
// The key is an expression rather than a column, which can't be represented in the model
isExpressionIndex = true;
break;
}

var name = reader2.GetString(0);
var column = table.Columns.FirstOrDefault(c => c.Name == name)
?? table.Columns.FirstOrDefault(c => c.Name.Equals(name, StringComparison.Ordinal));
Expand All @@ -1090,6 +1098,12 @@ ORDER BY "seqno"
}
}

if (isExpressionIndex)
{
_logger.ExpressionIndexSkippedWarning(index.Name, table.Name);
continue;
}

table.Indexes.Add(index);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1364,6 +1364,138 @@ Id2 text
},
"DROP TABLE UniqueIndex;");

[Fact]
public void Skip_index_on_expression_with_warning()
=> Test(
@"
CREATE TABLE ExpressionIndexTable (
Id integer PRIMARY KEY,
Name text
);

CREATE INDEX IX_LOWER_NAME on ExpressionIndexTable (lower(Name));
CREATE INDEX IX_NAME on ExpressionIndexTable (Name);",
[],
[],
dbModel =>
{
var index = Assert.Single(dbModel.Tables.Single().Indexes);
Assert.Equal("IX_NAME", index.Name);
Assert.Equal(["Name"], index.Columns.Select(ic => ic.Name).ToList());

var (_, id, message, _, _) = Assert.Single(Fixture.ListLoggerFactory.Log, t => t.Level == LogLevel.Warning);

var definition = SqliteResources.LogExpressionIndexSkipped(new TestLogger<SqliteLoggingDefinitions>());
Assert.Equal(definition.EventId, id);
Assert.Equal(definition.GenerateMessage("IX_LOWER_NAME", "ExpressionIndexTable"), message);
},
"DROP TABLE ExpressionIndexTable;");

[Fact]
public void Skip_index_mixing_columns_and_expressions_with_warning()
=> Test(
@"
CREATE TABLE MixedIndexTable (
Id integer PRIMARY KEY,
Name text
);

CREATE UNIQUE INDEX IX_MIXED on MixedIndexTable (Name, (Name || 'x'));",
[],
[],
dbModel =>
{
Assert.Empty(dbModel.Tables.Single().Indexes);

var (level, id, _, _, _) = Assert.Single(Fixture.ListLoggerFactory.Log, t => t.Level == LogLevel.Warning);
Assert.Equal(LogLevel.Warning, level);
Assert.Equal(SqliteEventId.ExpressionIndexSkippedWarning, id);
},
"DROP TABLE MixedIndexTable;");

[Fact]
public void Skip_only_the_index_on_expression_and_keep_the_other_indexes()
=> Test(
@"
CREATE TABLE SeveralIndexesTable (
Id integer PRIMARY KEY,
Name text
);

CREATE INDEX IX_NAME on SeveralIndexesTable (Name);
CREATE INDEX IX_EXPR on SeveralIndexesTable (lower(Name));
CREATE INDEX IX_OTHER on SeveralIndexesTable (Id, Name);",
[],
[],
dbModel =>
{
Assert.Equal(["IX_NAME", "IX_OTHER"], dbModel.Tables.Single().Indexes.Select(i => i.Name).Order().ToList());

var (_, id, message, _, _) = Assert.Single(Fixture.ListLoggerFactory.Log, t => t.Level == LogLevel.Warning);
var definition = SqliteResources.LogExpressionIndexSkipped(new TestLogger<SqliteLoggingDefinitions>());
Assert.Equal(definition.EventId, id);
Assert.Equal(definition.GenerateMessage("IX_EXPR", "SeveralIndexesTable"), message);
},
"DROP TABLE SeveralIndexesTable;");

[Fact]
public void Skip_all_indexes_on_expressions_with_a_warning_for_each()
=> Test(
@"
CREATE TABLE OnlyExpressionIndexesTable (
Id integer PRIMARY KEY,
Name text,
Amount int
);

CREATE INDEX ""IX_i'q"" on OnlyExpressionIndexesTable (lower(Name));
CREATE UNIQUE INDEX IX_ABS on OnlyExpressionIndexesTable (abs(Amount));",
[],
[],
dbModel =>
{
var table = Assert.Single(dbModel.Tables);
Assert.Empty(table.Indexes);

var definition = SqliteResources.LogExpressionIndexSkipped(new TestLogger<SqliteLoggingDefinitions>());
var messages = Fixture.ListLoggerFactory.Log
.Where(t => t.Level == LogLevel.Warning)
.Select(t => t.Message!)
.Order()
.ToList();

Assert.Equal(
new[]
{
definition.GenerateMessage("IX_ABS", "OnlyExpressionIndexesTable"),
definition.GenerateMessage("IX_i'q", "OnlyExpressionIndexesTable")
}.Order().ToList(),
messages);
},
"DROP TABLE OnlyExpressionIndexesTable;");

[Fact]
public void Skip_index_on_expression_but_keep_unique_constraint()
=> Test(
@"
CREATE TABLE ConstraintAndExpressionTable (
Id integer PRIMARY KEY,
Code text,
UNIQUE (Code)
);

CREATE INDEX IX_EXPR on ConstraintAndExpressionTable (lower(Code));",
[],
[],
dbModel =>
{
var table = Assert.Single(dbModel.Tables);
Assert.Empty(table.Indexes);
Assert.Equal(["Code"], Assert.Single(table.UniqueConstraints).Columns.Select(c => c.Name).ToList());
Assert.Single(Fixture.ListLoggerFactory.Log, t => t.Level == LogLevel.Warning);
},
"DROP TABLE ConstraintAndExpressionTable;");

#endregion

#region ForeignKeyFacets
Expand Down
Loading