Merge pull request #396 from igor-tkachev/dev

ili · web-flow · commit 556c9d9d54e5 · 2017-04-06T13:44:29.000+05:00
Fix #395
diff --git a/NuGet/BLToolkit.DB2.nuspec b/NuGet/BLToolkit.DB2.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.DB2</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>BLToolkit DB2 Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/NuGet/BLToolkit.DevartOraclePro.nuspec b/NuGet/BLToolkit.DevartOraclePro.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.Oracle</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>BLToolkit dotConnect for Oracle Pro Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/NuGet/BLToolkit.Firebird.nuspec b/NuGet/BLToolkit.Firebird.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.Firebird</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>BLToolkit Firebird Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/NuGet/BLToolkit.Informix.nuspec b/NuGet/BLToolkit.Informix.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.Informix</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>BLToolkit Informix Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/NuGet/BLToolkit.MySql.nuspec b/NuGet/BLToolkit.MySql.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.MySql</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>BLToolkit MySql Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/NuGet/BLToolkit.Oracle.Managed.nuspec b/NuGet/BLToolkit.Oracle.Managed.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.Oracle.Managed</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>BLToolkit Managed Oracle Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/NuGet/BLToolkit.Oracle.nuspec b/NuGet/BLToolkit.Oracle.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.Oracle</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>BLToolkit Oracle Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/NuGet/BLToolkit.PostgreSql.nuspec b/NuGet/BLToolkit.PostgreSql.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.PostgreSql</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>BLToolkit PostgreSql Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/NuGet/BLToolkit.SQLite.nuspec b/NuGet/BLToolkit.SQLite.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.SQLite</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>BLToolkit SQLite Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/NuGet/BLToolkit.SqlCe.nuspec b/NuGet/BLToolkit.SqlCe.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.SqlCe</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>BLToolkit SqlCe Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/NuGet/BLToolkit.Sybase.nuspec b/NuGet/BLToolkit.Sybase.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit.Sybase</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>BLToolkit Sybase Data Provider</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/NuGet/BLToolkit.nuspec b/NuGet/BLToolkit.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>Business Logic Toolkit for .NET</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/NuGet/BLToolkit.symbols.nuspec b/NuGet/BLToolkit.symbols.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>BLToolkit</id>
-		<version>4.3.6</version>
+		<version>4.3.7</version>
 		<title>Business Logic Toolkit for .NET</title>
 		<authors>Igor Tkachev</authors>
 		<owners />
diff --git a/README.md b/README.md
@@ -6,3 +6,12 @@ Master status [![Master status](https://ci.appveyor.com/api/projects/status/i6ed
 Business Logic Toolkit is a set of components to simplify .NET application development. BLToolkit is provided as source code that you can use "as is" or customize for your applications. It is written in C# and compatible with .NET Frameworks 3.5 and 4.0, Silverlight 4, and Mono.
 
 See [wiki](https://github.com/igor-tkachev/bltoolkit/wiki) for more details.
+
+# Attention 
+
+This project is suspended - no new features or functionallity would be implemented. Only **small bug** (if any would be reported) fixies would be done.
+
+And certainly we would be happy to merge **your** pull requests.
+
+Please, consider migrating to [linq2db](https://github.com/linq2db)
+
diff --git a/Source/Data/Linq/Builder/SelectContext.cs b/Source/Data/Linq/Builder/SelectContext.cs
@@ -905,7 +905,8 @@ T ProcessMemberAccess<T>(Expression expression, MemberExpression levelExpression
 				case ExpressionType.Parameter    :
 					if (sequence != null)
 						return action(2, sequence, newExpression, nextLevel, memberExpression);
-					throw new InvalidOperationException();
+					break;
+					//throw new InvalidOperationException();
 
 				case ExpressionType.New          :
 				case ExpressionType.MemberInit   :
diff --git a/Source/Data/Sql/SqlProvider/SqlCeSqlProvider.cs b/Source/Data/Sql/SqlProvider/SqlCeSqlProvider.cs
@@ -123,7 +123,7 @@ public override SqlQuery Finalize(SqlQuery sqlQuery)
 		{
 			sqlQuery = base.Finalize(sqlQuery);
 
-			new QueryVisitor().Visit(sqlQuery.Select, element =>
+			new QueryVisitor().Visit(sqlQuery, element =>
 			{
 				if (element.ElementType == QueryElementType.SqlParameter)
 				{
diff --git a/Source/Properties/BLToolkitConstants.cs b/Source/Properties/BLToolkitConstants.cs
@@ -20,7 +20,7 @@ public static partial class BLToolkitConstants
 		/// <summary>
 		/// Build component of version.
 		/// </summary>
-		public const string Build = "6";
+		public const string Build = "7";
 
 		/// <summary>
 		/// Full version string.
diff --git a/UnitTests/Linq/ConcatUnionTest.cs b/UnitTests/Linq/ConcatUnionTest.cs
@@ -9,6 +9,7 @@
 
 namespace Data.Linq
 {
+	using BLToolkit.Mapping;
 	using Model;
 
 	[TestFixture]
@@ -629,5 +630,64 @@ from t1 in tmp.DefaultIfEmpty()
 				Assert.IsNotNull(fullJoinSql);
 			}
 		}
+
+
+		[Test]
+		public void Issue395([DataContexts] string context)
+		{
+			var code = "code";
+
+			using (var db = GetDataContext(context))
+			{
+				var query01 = db.GetTable<Union01>()
+					.Where(x => x.LastName != null)
+					.Select(x => new Union()
+					{
+						Id = x.Id,
+						Name = x.LastName,
+						Code = code
+					})
+					;
+
+				var query02 = db.GetTable<Union02>()
+					.Where(x => x.LastName != null)
+					.Select(x => new Union()
+					{
+						Id = x.Id,
+						Name = x.LastName,
+						Code = code
+					})
+					;
+
+				var query = query01.Union(query02);
+
+				var res = query.ToList();
+			}
+		}
+
+		class Union
+		{
+			public int Id { get; set; }
+			public string Name { get; set; }
+			public string Code { get; set; }
+		}
+
+		[TableName("Person")]
+		class Union01
+		{
+			[MapField("PersonID"), PrimaryKey, NonUpdatable]
+			public int Id;
+
+			public string LastName;
+		}
+
+		[TableName("Person")]
+		class Union02
+		{
+			[MapField("PersonID"), PrimaryKey, NonUpdatable]
+			public int Id;
+
+			public string LastName;
+		}
 	}
 }
