Improved reporting of error when using SELECT * in scalar subquery

MarkMpn · Jun 25, 2024 · b666450 · b666450
1 parent 4328472
commit b666450
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/MarkMpn.Sql4Cds.Engine.Tests/AdoProviderTests.cs b/MarkMpn.Sql4Cds.Engine.Tests/AdoProviderTests.cs
@@ -2088,5 +2088,22 @@ SELECT STRING_AGG(CAST(ID AS NVARCHAR(MAX)), ',')
                 Assert.AreEqual("1,2,3", result);
             }
         }
+
+        [TestMethod]
+        public void InSelectStarError()
+        {
+            using (var con = new Sql4CdsConnection(_localDataSources))
+            {
+                try
+                {
+                    con.Execute("SELECT * FROM contact WHERE contactid IN (SELECT * FROM account)");
+                    Assert.Fail();
+                }
+                catch (Sql4CdsException ex)
+                {
+                    Assert.AreEqual(116, ex.Number);
+                }
+            }
+        }
     }
 }
diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlanBuilder.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlanBuilder.cs
@@ -2927,6 +2927,8 @@ private IDataExecutionPlanNodeInternal ConvertInSubquery(IDataExecutionPlanNodeI
             var innerQuery = ConvertSelectStatement(inSubquery.Subquery.QueryExpression, hints, schema, references, innerContext);
 
             // Scalar subquery must return exactly one column and one row
+            innerQuery.ExpandWildcardColumns(innerContext);
+
             if (innerQuery.ColumnSet.Count != 1)
                 throw new NotSupportedQueryFragmentException(Sql4CdsError.MultiColumnScalarSubquery(inSubquery.Subquery));