Merge pull request #147 from DataObjects-NET/master-typeid-as-parameter

Constant Type identifiers as parameter of SQL query

Author: alex-kulakov

ChangeLog/7.1.0-Beta-2-dev.txt

@@ -17,6 +17,8 @@
 [main] EntitySetChangeRegistry.GetItems() changed result type to improve enumeration
 [main] IgnoreRule now has only one public constructor - parameterless
 [main] IgnoreRule supports indexes
+[main] Queries use parameters instead of constant values for type indentifiers within columns list
+[main] Added DomainConfiguration.PreferTypeIdsAsQueryParameters to choose between contants and parameters for TypeIds
 [main] BitFaster.Caching package reference is updated to 1.0.7
 [main] No error caused by ambiguity due to new IQueryable extension methods of .Net 6
 [reprocessing] DomainBuildErrorEventArgs (not sealed) became read-only structure

Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v2_5/ServerInfoProvider.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2020 Xtensive LLC.
+// Copyright (C) 2011-2021 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Csaba Beer
@@ -179,13 +179,13 @@ public override QueryInfo GetQueryInfo()
       queryInfo.MaxQueryParameterCount = DoNotKnow;
       queryInfo.Features =
         QueryFeatures.NamedParameters |
-          QueryFeatures.ParameterPrefix |
-            QueryFeatures.ScalarSubquery |
-              QueryFeatures.Paging |
-                QueryFeatures.Limit |
-                  QueryFeatures.Offset |
-                    QueryFeatures.UpdateLimit |
-                      QueryFeatures.DeleteLimit;
+        QueryFeatures.ParameterPrefix |
+        QueryFeatures.ScalarSubquery |
+        QueryFeatures.Paging |
+        QueryFeatures.Limit |
+        QueryFeatures.Offset |
+        QueryFeatures.UpdateLimit |
+        QueryFeatures.DeleteLimit;
       return queryInfo;
     }
 

Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/v5_0/ServiceInfoProvider.cs

@@ -206,7 +206,8 @@ public override QueryInfo GetQueryInfo()
         QueryFeatures.ScalarSubquery |
         QueryFeatures.SelfReferencingRowRemovalIsError |
         QueryFeatures.StrictJoinSyntax |
-        QueryFeatures.Batches;
+        QueryFeatures.Batches |
+        QueryFeatures.ParameterAsColumn;
       return queryInfo;
     }
 

Orm/Xtensive.Orm.Oracle/Sql.Drivers.Oracle/v09/ServerInfoProvider.cs

@@ -192,7 +192,8 @@ public override QueryInfo GetQueryInfo()
         QueryFeatures.InsertDefaultValues |
         QueryFeatures.UpdateDefaultValues |
         QueryFeatures.MultischemaQueries |
-        QueryFeatures.RowNumber;
+        QueryFeatures.RowNumber |
+        QueryFeatures.ParameterAsColumn;
       return queryInfo;
     }
 

Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/SqlCompiler.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2020 Xtensive LLC.
+// Copyright (C) 2009-2021 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
@@ -22,15 +22,16 @@ protected override SqlProvider VisitFreeText(FreeTextProvider provider)
     {
       var rankColumnName = provider.Header.Columns[provider.Header.Columns.Count - 1].Name;
       var stringTypeMapping = Driver.GetTypeMapping(WellKnownTypes.StringType);
-      var binding = new QueryParameterBinding(stringTypeMapping,
+      var searchCriteriaBinding = new QueryParameterBinding(stringTypeMapping,
         provider.SearchCriteria.Invoke, QueryParameterBindingType.Regular);
 
       var select = SqlDml.Select();
       var realPrimaryIndex = provider.PrimaryIndex.Resolve(Handlers.Domain.Model);
       var index = realPrimaryIndex.ReflectedType.Indexes.PrimaryIndex;
-      var query = BuildProviderQuery(index);
+      var queryAndBindings = BuildProviderQuery(index);
+      var query = queryAndBindings.Query;
       var table = Mapping[realPrimaryIndex.ReflectedType];
-      var fromTable = SqlDml.FreeTextTable(table, binding.ParameterReference,
+      var fromTable = SqlDml.FreeTextTable(table, searchCriteriaBinding.ParameterReference,
         table.Columns.Select(column => column.Name).Append(rankColumnName).ToArray(table.Columns.Count + 1));
       var fromTableRef = SqlDml.QueryRef(fromTable);
       foreach (var column in query.Columns) {
@@ -40,16 +41,15 @@ protected override SqlProvider VisitFreeText(FreeTextProvider provider)
       select.Columns.Add(SqlDml.Cast(fromTableRef.Columns[rankColumnName], SqlType.Double), rankColumnName);
       select.From = fromTableRef;
       if (provider.TopN == null) {
-        return CreateProvider(select, binding, provider);
+        return CreateProvider(select, queryAndBindings.Bindings.Append(searchCriteriaBinding), provider);
       }
 
       var intTypeMapping = Driver.GetTypeMapping(typeof(int));
       var topNBinding = new QueryParameterBinding(
         intTypeMapping, context => provider.TopN.Invoke(context), QueryParameterBindingType.Regular);
       select.Limit = topNBinding.ParameterReference;
       select.OrderBy.Add(select.Columns[rankColumnName], false);
-      return CreateProvider(select, new[] {binding, topNBinding}, provider);
-
+      return CreateProvider(select, queryAndBindings.Bindings.Append(topNBinding).Append(searchCriteriaBinding), provider);
     }
 
     protected override SqlExpression ProcessAggregate(SqlProvider source, List<SqlExpression> sourceColumns, AggregateColumn aggregateColumn)

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v8_0/Compiler.cs

@@ -13,6 +13,8 @@ namespace Xtensive.Sql.Drivers.PostgreSql.v8_0
 {
   internal class Compiler : SqlCompiler
   {
+    private readonly static Type SqlPlaceholderType = typeof(SqlPlaceholder);
+
     private static readonly SqlNative OneYearInterval = SqlDml.Native("interval '1 year'");
     private static readonly SqlNative OneMonthInterval = SqlDml.Native("interval '1 month'");
     private static readonly SqlNative OneDayInterval = SqlDml.Native("interval '1 day'");
@@ -31,9 +33,27 @@ public override void Visit(SqlDeclareCursor node)
     public override void Visit(SqlBinary node)
     {
       var right = node.Right as SqlArray;
-      if (right is not null && (node.NodeType is SqlNodeType.In or SqlNodeType.NotIn)) {
-        var row = SqlDml.Row(right.GetValues().Select(value => SqlDml.Literal(value)).ToArray());
-        base.Visit(node.NodeType == SqlNodeType.In ? SqlDml.In(node.Left, row) : SqlDml.NotIn(node.Left, row));
+      if (right is not null && (node.NodeType==SqlNodeType.In || node.NodeType==SqlNodeType.NotIn)) {
+        if (right.ItemType == SqlPlaceholderType) {
+          using (context.EnterScope(node)) {
+            AppendTranslatedEntry(node);
+            node.Left.AcceptVisitor(this);
+            translator.Translate(context.Output, node.NodeType);
+            _ = context.Output.AppendOpeningPunctuation("(");
+            var items = right.GetValues();
+            for (var i = 0; i < items.Length - 1; i++) {
+              Visit((SqlPlaceholder) items[i]);
+              _ = context.Output.Append(translator.RowItemDelimiter);
+            }
+            Visit((SqlPlaceholder) items[^1]);
+            _ = context.Output.Append(")");
+            AppendTranslatedExit(node);
+          }
+        }
+        else {
+          var row = SqlDml.Row(right.GetValues().Select(value => SqlDml.Literal(value)).ToArray());
+          base.Visit(node.NodeType == SqlNodeType.In ? SqlDml.In(node.Left, row) : SqlDml.NotIn(node.Left, row));
+        }
       }
       else {
         switch (node.NodeType) {
@@ -381,4 +401,4 @@ protected internal Compiler(SqlDriver driver)
     {
     }
   }
-}
+}

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v8_0/ServerInfoProvider.cs

@@ -253,7 +253,8 @@ public override QueryInfo GetQueryInfo()
         QueryFeatures.InsertDefaultValues |
         QueryFeatures.UpdateDefaultValues |
         QueryFeatures.MultischemaQueries |
-        QueryFeatures.ScalarSubquery;
+        QueryFeatures.ScalarSubquery |
+        QueryFeatures.ParameterAsColumn;
       info.ParameterPrefix = "@";
       info.MaxComparisonOperations = 1000000;
       info.MaxLength = 1000000;

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/ServerInfoProvider.cs

@@ -198,7 +198,8 @@ public override QueryInfo GetQueryInfo()
         QueryFeatures.MultischemaQueries |
         QueryFeatures.MultidatabaseQueries |
         QueryFeatures.ScalarSubquery |
-        QueryFeatures.PagingRequiresOrderBy;
+        QueryFeatures.PagingRequiresOrderBy |
+        QueryFeatures.ParameterAsColumn;
       return queryInfo;
     }
 

Orm/Xtensive.Orm.Sqlite/Sql.Drivers.Sqlite/v3/ServerInfoProvider.cs

@@ -171,7 +171,8 @@ public override QueryInfo GetQueryInfo()
         | QueryFeatures.Offset
         | QueryFeatures.InsertDefaultValues
         | QueryFeatures.StrictJoinSyntax
-        | QueryFeatures.ScalarSubquery;
+        | QueryFeatures.ScalarSubquery
+        | QueryFeatures.ParameterAsColumn;
       return queryInfo;
     }