From c67027c281d74978df2ee0efc26de7dc0c24823c Mon Sep 17 00:00:00 2001 From: Daniel Oliveira Date: Thu, 14 May 2026 15:37:53 +0100 Subject: [PATCH] fix(codeql): resolve open code-scanning alerts - Cast Equals argument to object in ExpressionTests so the intentional "Equals returns false for unrelated type" tests no longer trip cs/equals-on-unrelated-types. - Lift the KeyField skip in ParadeDbModelFinalizingConvention into a Where clause to satisfy cs/linq/missed-where. --- .../ExpressionTests.cs | 6 ++++-- .../ParadeDbModelFinalizingConvention.cs | 5 +---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Equibles.ParadeDB.EntityFrameworkCore.Tests/ExpressionTests.cs b/Equibles.ParadeDB.EntityFrameworkCore.Tests/ExpressionTests.cs index 95675b0..eef3e64 100644 --- a/Equibles.ParadeDB.EntityFrameworkCore.Tests/ExpressionTests.cs +++ b/Equibles.ParadeDB.EntityFrameworkCore.Tests/ExpressionTests.cs @@ -97,8 +97,9 @@ public void ModifiedQueryExpression_Equals_ReturnsFalseForUnrelatedType() typeof(string), inner.TypeMapping ); + object unrelated = "not an expression"; - Assert.False(a.Equals("not an expression")); + Assert.False(a.Equals(unrelated)); } [Fact] @@ -407,8 +408,9 @@ public void NamedArgFunctionExpression_Equals_ReturnsFalseForUnrelatedType() typeof(string), arg.TypeMapping ); + object unrelated = "not an expression"; - Assert.False(a.Equals("not an expression")); + Assert.False(a.Equals(unrelated)); } [Fact] diff --git a/Equibles.ParadeDB.EntityFrameworkCore/ParadeDbModelFinalizingConvention.cs b/Equibles.ParadeDB.EntityFrameworkCore/ParadeDbModelFinalizingConvention.cs index d297566..a6da699 100644 --- a/Equibles.ParadeDB.EntityFrameworkCore/ParadeDbModelFinalizingConvention.cs +++ b/Equibles.ParadeDB.EntityFrameworkCore/ParadeDbModelFinalizingConvention.cs @@ -109,11 +109,8 @@ IConventionIndexBuilder indexBuilder var datetimeFields = new JsonObject(); var jsonFields = new JsonObject(); - foreach (var propertyName in attribute.Columns) + foreach (var propertyName in attribute.Columns.Where(c => c != attribute.KeyField)) { - if (propertyName == attribute.KeyField) - continue; - var property = entityType.FindProperty(propertyName); var propertyInfo = property?.PropertyInfo; if (propertyInfo == null)