Merge branch '3.4.x'

Author: hazzik

src/NHibernate.Test/MappingByCode/ExpliticMappingTests/ClassWithoutNamespaceTests.cs

@@ -0,0 +1,35 @@
+using System;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.MappingByCode.ExpliticMappingTests
+{
+	[TestFixture]
+	public class ClassWithoutNamespaceTests
+	{
+		[SetUp]
+		public void OnSetUp()
+		{
+			Assert.That(typeof (EntityNH3615).Namespace, Is.Null);
+		}
+
+		[Test]
+		public void ShouldBeAbleToMapClassWithoutNamespace()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<EntityNH3615>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+				rc.Property(x => x.Name);
+			});
+
+			Assert.DoesNotThrow(() => mapper.CompileMappingForAllExplicitlyAddedEntities());
+		}
+	}
+}
+
+internal class EntityNH3615
+{
+	public virtual Guid Id { get; set; }
+	public virtual string Name { get; set; }
+}

src/NHibernate.Test/NHSpecificTest/NH3614/Entity.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH3614
+{
+	public class Entity
+	{
+		public virtual int Id { get; protected set; }
+		public virtual IList<string> SomeStrings { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3614/Fixture.cs

@@ -0,0 +1,51 @@
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NHibernate.Linq;
+
+namespace NHibernate.Test.NHSpecificTest.NH3614
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		[Test]
+		public void CanProjectListOfStrings()
+		{
+			int id;
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+				var testEntity = new Entity
+				{
+					SomeStrings = new List<string> { "Hello", "World" }
+				};
+				s.Save(testEntity);
+
+				tx.Commit();
+
+				id = testEntity.Id;
+			}
+
+			using (var s = OpenSession())
+			{
+				var result = s.Query<Entity>()
+					.Where(x => x.Id == id)
+					.Select(x => x.SomeStrings)
+					.ToList();
+
+				Assert.AreEqual(1, result.Count);
+
+				Assert.AreEqual(2, result.Single().Count);
+			}
+
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+				s.Delete("from Entity");
+				tx.Commit();
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3614/Mappings.hbm.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+	assembly="NHibernate.Test"
+	namespace="NHibernate.Test.NHSpecificTest.NH3614">
+
+<class name="Entity">
+	<id name="Id">
+		<generator class="native" />
+	</id>
+
+	<bag name="SomeStrings" table="SomeStrings" cascade="all-delete-orphan" >
+		<key>
+			<column name="ParentId" />
+		</key>
+		<element type="System.String, mscorlib">
+			<column name="StringValue" />
+		</element>
+	</bag>
+</class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -707,6 +707,9 @@
     <Compile Include="NHSpecificTest\NH3058\SampleTest.cs" />
     <Compile Include="NHSpecificTest\NH1818\DomainClass.cs" />
     <Compile Include="NHSpecificTest\NH1818\Fixture1818.cs" />
+    <Compile Include="MappingByCode\ExpliticMappingTests\ClassWithoutNamespaceTests.cs" />
+    <Compile Include="NHSpecificTest\NH3614\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH3614\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3505\Student.cs" />
     <Compile Include="NHSpecificTest\NH3505\Teacher.cs" />
     <Compile Include="NHSpecificTest\NH3505\Fixture.cs" />
@@ -3030,6 +3033,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH3058\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2985\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1818\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH3614\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3505\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3428\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3408\Mappings.hbm.xml" />
@@ -3552,6 +3556,7 @@
     <EmbeddedResource Include="DynamicEntity\Tuplizer\Customer.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="NHSpecificTest\NH3615\" />
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
@@ -3587,4 +3592,4 @@ if exist hibernate.cfg.xml (del hibernate.cfg.xml)
 if exist "$(ProjectDir)hibernate.cfg.xml" (copy "$(ProjectDir)hibernate.cfg.xml" "hibernate.cfg.xml")
 copy /y "..\..\..\NHibernate.DomainModel\ABC.hbm.xml" "ABC.hbm.xml"</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

src/NHibernate/Linq/NestedSelects/NestedSelectRewriter.cs

@@ -220,6 +220,9 @@ private static LambdaExpression MakePredicate(int index)
 
 		private static Expression GetIdentifier(ISessionFactory sessionFactory, Expression expression)
 		{
+			if (expression.Type.IsPrimitive || expression.Type == typeof(string))
+				return expression;
+
 			var classMetadata = sessionFactory.GetClassMetadata(expression.Type);
 			if (classMetadata == null)
 				return Expression.Constant(null);
@@ -268,4 +271,4 @@ private static System.Type GetElementType(System.Type type)
 			return elementType;
 	}
 	}
-}
+}

src/NHibernate/Mapping/ByCode/Impl/TypeNameUtil.cs

@@ -34,12 +34,12 @@ public static string GetShortClassName(this System.Type type, HbmMapping mapDoc)
 			string typeAssemblyFullName = type.Assembly.FullName;
 			string typeNameSpace = type.Namespace;
 			string assembly = null;
-			if (!typeAssembly.Equals(mapDoc.assembly) && !typeAssemblyFullName.Equals(mapDoc.assembly))
+			if (typeAssembly != mapDoc.assembly && typeAssemblyFullName != mapDoc.assembly)
 			{
 				assembly = typeAssembly;
 			}
 			string @namespace = null;
-			if (!typeNameSpace.Equals(mapDoc.@namespace))
+			if (typeNameSpace != mapDoc.@namespace)
 			{
 				@namespace = typeNameSpace;
 			}

src/NHibernate/Mapping/ByCode/ModelMapper.cs

@@ -557,7 +557,7 @@ public HbmMapping CompileMappingFor(IEnumerable<System.Type> types)
 			{
 				defaultAssemblyName = firstType.Assembly.GetName().Name;
 			}
-			if (firstType != null && typeToMap.All(t => t.Namespace.Equals(firstType.Namespace)))
+			if (firstType != null && typeToMap.All(t => t.Namespace == firstType.Namespace))
 			{
 				defaultNamespace = firstType.Namespace;
 			}