#At file:///C:/Users/Reggie/work/connector-net/trunk/ based on revid:julio.casal@stripped
972 Reggie Burnett 2011-04-20 [merge]
merged
modified:
MySql.Data.Entity/Provider/Fragments/SqlFragment.cs
MySql.Data.Entity/Provider/Generators/SelectGenerator.cs
MySql.Data.Entity/Provider/Generators/SqlGenerator.cs
MySql.Data.Entity/Provider/Statements/SelectStatement.cs
MySql.Data.Entity/Tests/JoinTests.cs
MySql.Data.Entity/Tests/Properties/SQLSyntax.Designer.cs
MySql.Data.Entity/Tests/Properties/SQLSyntax.resx
=== modified file 'MySql.Data.Entity/Provider/Fragments/SqlFragment.cs'
=== modified file 'MySql.Data.Entity/Provider/Fragments/SqlFragment.cs'
--- a/MySql.Data.Entity/Provider/Fragments/SqlFragment.cs 2011-03-03 18:01:04 +0000
+++ b/MySql.Data.Entity/Provider/Fragments/SqlFragment.cs 2011-04-20 18:40:38 +0000
@@ -136,6 +136,7 @@
public string TableName { get; set; }
public string ColumnName { get; set; }
public string ColumnAlias { get; set; }
+ public PropertyFragment PropertyFragment { get; set; }
public override void WriteSql(StringBuilder sql)
{
@@ -154,6 +155,14 @@
if (ColumnAlias != null && ColumnAlias != ColumnName)
sql.AppendFormat(" AS {0}", QuoteIdentifier(ColumnAlias));
}
+
+ public ColumnFragment Clone()
+ {
+ ColumnFragment cf = new ColumnFragment(TableName, ColumnName);
+ cf.ColumnAlias = ColumnAlias;
+ cf.Literal = Literal;
+ return cf;
+ }
}
internal class ExistsFragment : NegatableFragment
=== modified file 'MySql.Data.Entity/Provider/Generators/SelectGenerator.cs'
--- a/MySql.Data.Entity/Provider/Generators/SelectGenerator.cs 2011-03-03 18:01:04 +0000
+++ b/MySql.Data.Entity/Provider/Generators/SelectGenerator.cs 2011-04-20 18:40:38 +0000
@@ -153,9 +153,17 @@
join.JoinType = Metadata.GetOperator(joinType);
join.Left = VisitInputExpression(left.Expression, left.VariableName, left.VariableType);
- WrapJoinInputIfNecessary(join.Left, false);
+ join.Left = WrapJoinInputIfNecessary(join.Left, false);
+
join.Right = VisitInputExpression(right.Expression, right.VariableName, right.VariableType);
- WrapJoinInputIfNecessary(join.Right, true);
+ join.Right = WrapJoinInputIfNecessary(join.Right, true);
+
+ if (join.Right is SelectStatement)
+ {
+ SelectStatement select = join.Right as SelectStatement;
+ if (select.IsWrapped)
+ select.Name = right.VariableName;
+ }
// now handle the ON case
if (joinCondition != null)
@@ -173,7 +181,7 @@
return newSelect;
}
- private void WrapJoinInputIfNecessary(InputFragment fragment, bool isRightPart)
+ private InputFragment WrapJoinInputIfNecessary(InputFragment fragment, bool isRightPart)
{
if (fragment is SelectStatement || fragment is UnionFragment)
{
@@ -181,7 +189,14 @@
fragment.Scoped = true;
}
else if (fragment is JoinFragment && isRightPart)
- fragment.Wrap(null);
+ {
+ SelectStatement select = new SelectStatement();
+ select.From = fragment;
+ select.Name = fragment.Name;
+ select.Wrap(scope);
+ return select;
+ }
+ return fragment;
}
public override SqlFragment Visit(DbNewInstanceExpression expression)
=== modified file 'MySql.Data.Entity/Provider/Generators/SqlGenerator.cs'
--- a/MySql.Data.Entity/Provider/Generators/SqlGenerator.cs 2011-03-03 18:01:04 +0000
+++ b/MySql.Data.Entity/Provider/Generators/SqlGenerator.cs 2011-04-20 18:40:38 +0000
@@ -82,6 +82,7 @@
if (propertyLevel > 0) return fragment;
ColumnFragment column = new ColumnFragment(null, fragment.LastProperty);
+ column.PropertyFragment = fragment;
column.TableName = FindInputFromProperties(fragment);
return column;
@@ -436,6 +437,7 @@
Debug.Assert(f is InputFragment);
InputFragment inputFragment = f as InputFragment;
+ inputFragment.Name = name;
if (inputFragment is TableFragment && type != null)
(inputFragment as TableFragment).Type = type;
=== modified file 'MySql.Data.Entity/Provider/Statements/SelectStatement.cs'
--- a/MySql.Data.Entity/Provider/Statements/SelectStatement.cs 2011-03-03 18:01:04 +0000
+++ b/MySql.Data.Entity/Provider/Statements/SelectStatement.cs 2011-04-20 18:40:38 +0000
@@ -131,20 +131,38 @@
void AddDefaultColumns()
{
+// List<PropertyFragment> properties = GetColumnPropertiesFromInput(From);
AddDefaultColumnsForFragment(From);
}
+ //private List<PropertyFragment> GetColumnPropertiesFromInput(InputFragment input)
+ //{
+ // if (input is TableFragment)
+ //}
+
void AddDefaultColumnsForFragment(InputFragment input)
{
if (input is TableFragment)
{
AddDefaultColumnsForTable(input as TableFragment);
}
- else if (input is JoinFragment)
- {
- JoinFragment j = input as JoinFragment;
- AddDefaultColumnsForFragment(j.Left);
- AddDefaultColumnsForFragment(j.Right);
+ else if (input is JoinFragment || input is UnionFragment)
+ {
+ if (input.Left != null)
+ AddDefaultColumnsForFragment(input.Left);
+ if (input.Right != null)
+ AddDefaultColumnsForFragment(input.Right);
+
+ // if this input is scoped, then it is the base tablename for the columns
+ if (input.Scoped)
+ foreach (ColumnFragment col in Columns)
+ col.TableName = input.Name;
+ }
+ else if (input is SelectStatement)
+ {
+ SelectStatement select = input as SelectStatement;
+ foreach (ColumnFragment cf in select.Columns)
+ Columns.Add(cf.Clone());
}
else
throw new NotImplementedException();
=== modified file 'MySql.Data.Entity/Tests/JoinTests.cs'
--- a/MySql.Data.Entity/Tests/JoinTests.cs 2011-03-03 18:01:04 +0000
+++ b/MySql.Data.Entity/Tests/JoinTests.cs 2011-04-20 18:40:38 +0000
@@ -99,5 +99,41 @@
Assert.AreEqual(dt.Rows.Count, i);
}
}
+
+ [Test]
+ public void JoinOnRightSideAsDerivedTable()
+ {
+ using (testEntities context = new testEntities())
+ {
+ var q = from child in context.Children
+ join emp in context.Employees
+ on child.EmployeeID equals emp.Id
+ where child.BirthWeight > 7
+ select child;
+ string sql = q.ToTraceString();
+ CheckSql(sql, SQLSyntax.JoinOnRightSideAsDerivedTable);
+
+ foreach (Child c in q)
+ {
+ }
+ }
+ }
+
+ [Test]
+ public void JoinOnRightSideNameClash()
+ {
+
+ using (testEntities context = new testEntities())
+ {
+ var inner = from a in context.Authors join s in context.Stores on a.Id equals s.Id select a;
+ var outer = from o in context.Orders join i in inner on o.Id equals i.Id select o;
+ string sql = outer.ToTraceString();
+ CheckSql(sql, SQLSyntax.JoinOnRightSideNameClash);
+ foreach (Order o in outer)
+ {
+ double d = o.Freight;
+ }
+ }
+ }
}
}
\ No newline at end of file
=== modified file 'MySql.Data.Entity/Tests/Properties/SQLSyntax.Designer.cs'
--- a/MySql.Data.Entity/Tests/Properties/SQLSyntax.Designer.cs 2011-03-03 17:54:43 +0000
+++ b/MySql.Data.Entity/Tests/Properties/SQLSyntax.Designer.cs 2011-04-20 18:36:21 +0000
@@ -195,6 +195,54 @@
/// <summary>
/// Looks up a localized string similar to SELECT
///Extent1.Id,
+ ///Extent1.EmployeeID,
+ ///Extent1.LastName,
+ ///Extent1.FirstName,
+ ///Extent1.BirthTime,
+ ///Extent1.Weight,
+ ///Extent1.LastModified
+ ///FROM EmployeeChildren AS Extent1 INNER JOIN (SELECT
+ ///Extent2.Id,
+ ///Extent2.LastName,
+ ///Extent2.FirstName,
+ ///Extent2.Age,
+ ///Extent3.EmployeeId,
+ ///Extent3.Salary
+ ///FROM Employees AS Extent2 LEFT OUTER JOIN SalariedEmployees AS Extent3 ON Extent2.Id = Extent3.EmployeeId) AS Join1 ON (Extent1.EmployeeID = Join1.Id) OR ((Extent1.EmployeeID IS NULL) AND (Join1.Id IS NU [rest of string was truncated]";.
+ /// </summary>
+ internal static string JoinOnRightSideAsDerivedTable {
+ get {
+ return ResourceManager.GetString("JoinOnRightSideAsDerivedTable", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///Extent1.Id,
+ ///Extent1.Freight,
+ ///Extent1.StoreId
+ ///FROM Orders AS Extent1 INNER JOIN (SELECT
+ ///Extent2.Id,
+ ///Extent2.Name,
+ ///Extent2.Age,
+ ///Extent3.Id AS Id1,
+ ///Extent3.Name AS Name1,
+ ///Extent3.Address,
+ ///Extent3.City,
+ ///Extent3.State,
+ ///Extent3.ZipCode
+ ///FROM Authors AS Extent2 INNER JOIN Stores AS Extent3 ON (Extent2.Id = Extent3.Id) OR ((Extent2.Id IS NULL) AND (Extent3.Id IS NULL))) AS Join1 ON (Extent1.Id = Join1.Id) OR ((Extent1.Id IS NULL) AND (Join1.Id IS NULL)).
+ /// </summary>
+ internal static string JoinOnRightSideNameClash {
+ get {
+ return ResourceManager.GetString("JoinOnRightSideNameClash", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Extent1.Id,
///Extent1.Name,
///Extent1.Address,
///Extent1.City,
=== modified file 'MySql.Data.Entity/Tests/Properties/SQLSyntax.resx'
--- a/MySql.Data.Entity/Tests/Properties/SQLSyntax.resx 2011-03-03 17:54:43 +0000
+++ b/MySql.Data.Entity/Tests/Properties/SQLSyntax.resx 2011-04-20 18:36:21 +0000
@@ -201,6 +201,43 @@
FROM Toys AS Extent2
WHERE (Project1.Id = Extent2.SupplierId) AND (Extent2.MinAge < 4))</value>
</data>
+ <data name="JoinOnRightSideAsDerivedTable" xml:space="preserve">
+ <value>SELECT
+Extent1.Id,
+Extent1.EmployeeID,
+Extent1.LastName,
+Extent1.FirstName,
+Extent1.BirthTime,
+Extent1.Weight,
+Extent1.LastModified
+FROM EmployeeChildren AS Extent1 INNER JOIN (SELECT
+Extent2.Id,
+Extent2.LastName,
+Extent2.FirstName,
+Extent2.Age,
+Extent3.EmployeeId,
+Extent3.Salary
+FROM Employees AS Extent2 LEFT OUTER JOIN SalariedEmployees AS Extent3 ON Extent2.Id = Extent3.EmployeeId) AS Join1 ON (Extent1.EmployeeID = Join1.Id) OR ((Extent1.EmployeeID IS NULL) AND (Join1.Id IS NULL))
+ WHERE Extent1.Weight > 7</value>
+ </data>
+ <data name="JoinOnRightSideNameClash" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+Extent1.Id,
+Extent1.Freight,
+Extent1.StoreId
+FROM Orders AS Extent1 INNER JOIN (SELECT
+Extent2.Id,
+Extent2.Name,
+Extent2.Age,
+Extent3.Id AS Id1,
+Extent3.Name AS Name1,
+Extent3.Address,
+Extent3.City,
+Extent3.State,
+Extent3.ZipCode
+FROM Authors AS Extent2 INNER JOIN Stores AS Extent3 ON (Extent2.Id = Extent3.Id) OR ((Extent2.Id IS NULL) AND (Extent3.Id IS NULL))) AS Join1 ON (Extent1.Id = Join1.Id) OR ((Extent1.Id IS NULL) AND (Join1.Id IS NULL))</value>
+ </data>
<data name="MaxInSubQuery1" xml:space="preserve">
<value>SELECT
Extent1.Id,
No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
| Thread |
|---|
| • bzr commit into connector-net-trunk branch (reggie.burnett:972) | Reggie Burnett | 20 Apr |
