#253 add JoinTableParserTest

Fixed an issue where From clause parsing did not work.

src/QueryBuilderByLinq/Analysis/FromTableInfoParser.cs

@@ -82,14 +82,41 @@ public static class FromTableInfoParser
 		if (lambda == null) return null;
 
 		var body = lambda.GetBody<MethodCallExpression>();
-		if (body == null || body.Method.Name != nameof(Sql.FromTable)) return null;
+		if (body == null) return null;
 
+		// no relation pattern.
 		var operand = method.GetArgument<UnaryExpression>(2).GetOperand<LambdaExpression>();
 		if (operand == null) return null;
-
-		//name
 		if (operand.Parameters.Count != 2) return null;
 		var parameter = operand.Parameters[1];
+
+		if (body.Method.Name == nameof(Sql.FromTable))
+		{
+			return ParseCore3ArgumentsFromTable(body, parameter);
+		}
+		else if (body.Method.Name == nameof(Sql.InnerJoinTable) || body.Method.Name == nameof(Sql.LeftJoinTable) || body.Method.Name == nameof(Sql.CrossJoinTable))
+		{
+			/*
+				has relation pattern.
+				'body' is relation conditions.
+				'parameter' is relation alias.
+			*/
+
+			//query
+			lambda = method.GetArgument<UnaryExpression>(2).GetOperand<LambdaExpression>();
+			if (lambda == null || lambda.Parameters.Count != 2) return null;
+
+			var prm = lambda.Parameters[0];
+			return new FromTableInfo(prm.ToTypeTable(), prm.Name!);
+		}
+
+		return null;
+	}
+
+	private static FromTableInfo? ParseCore3ArgumentsFromTable(MethodCallExpression body, ParameterExpression parameter)
+	{
+		if (body.Method.Name != nameof(Sql.FromTable)) throw new InvalidProgramException();
+
 		var alias = parameter.Name!;
 
 		//table

test/QueryBuilderByLinq.Test/Analysis/JoinTableInfoParserTest.cs

@@ -0,0 +1,89 @@
+using Carbunql;
+using QueryBuilderByLinq.Analysis;
+using Xunit.Abstractions;
+using static QueryBuilderByLinq.Sql;
+
+namespace QueryBuilderByLinq.Test.Analysis;
+
+public class JoinTableInfoParserTest
+{
+	private readonly QueryCommandMonitor Monitor;
+
+	public JoinTableInfoParserTest(ITestOutputHelper output)
+	{
+		Monitor = new QueryCommandMonitor(output);
+		Output = output;
+	}
+
+	private ITestOutputHelper Output { get; set; }
+
+	[Fact]
+	public void NoRelationTest()
+	{
+		var query = from a in FromTable<sale>()
+					select a;
+
+		Monitor.Log(query);
+
+		var joins = JoinTableInfoParser.Parse(query.Expression);
+
+		Assert.Empty(joins);
+	}
+
+	[Fact]
+	public void InnerJoinTest()
+	{
+		var query = from s in FromTable<sale>()
+					from a in InnerJoinTable<article>(x => s.article_id == x.article_id)
+					select a;
+
+		Monitor.Log(query);
+
+		var from = FromTableInfoParser.Parse(query.Expression);
+		Assert.Equal("sale", from?.ToSelectable().ToText());
+		Assert.Equal("s", from?.Alias);
+
+		var joins = JoinTableInfoParser.Parse(query.Expression);
+
+		Assert.Empty(joins);
+	}
+
+	[Fact]
+	public void LeftJoinTest()
+	{
+		var query = from s in FromTable<sale>()
+					from a in LeftJoinTable<article>(x => s.article_id == x.article_id)
+					select a;
+
+		Monitor.Log(query);
+
+		var from = FromTableInfoParser.Parse(query.Expression);
+		Assert.Equal("sale", from?.ToSelectable().ToText());
+		Assert.Equal("s", from?.Alias);
+
+		var joins = JoinTableInfoParser.Parse(query.Expression);
+
+		Assert.Empty(joins);
+	}
+
+	[Fact]
+	public void CrossJoinTest()
+	{
+		var query = from s in FromTable<sale>()
+					from a in CrossJoinTable<article>()
+					select a;
+
+		Monitor.Log(query);
+
+		var from = FromTableInfoParser.Parse(query.Expression);
+		Assert.Equal("sale", from?.ToSelectable().ToText());
+		Assert.Equal("s", from?.Alias);
+
+		var joins = JoinTableInfoParser.Parse(query.Expression);
+
+		Assert.Empty(joins);
+	}
+
+	public record struct sale(int sales_id, int article_id, int quantity);
+	public record struct article(int article_id, string article_name, int price);
+}