Skip to content

Fix cacheable CreateSQLQuery throws on query with AddJoin #2088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 3, 2019
Merged

Fix cacheable CreateSQLQuery throws on query with AddJoin #2088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e80aaee
Fix cacheable CreateSQLQuery throws ArgumentException on query with A…
bahusoid Mar 26, 2019
718734e
Merge branch 'master' into sqlQueryAddJoinCache
hazzik Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 110 additions & 41 deletions src/NHibernate.Test/Async/SqlTest/Query/NativeSQLQueriesFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,61 +90,130 @@ public async Task FailOnNoAddEntityOrScalarAsync()
[Test]
public async Task SQLQueryInterfaceAsync()
{
ISession s = OpenSession();
ITransaction t = s.BeginTransaction();
Organization ifa = new Organization("IFA");
Organization jboss = new Organization("JBoss");
Person gavin = new Person("Gavin");
Employment emp = new Employment(gavin, jboss, "AU");

await (s.SaveAsync(ifa));
await (s.SaveAsync(jboss));
await (s.SaveAsync(gavin));
await (s.SaveAsync(emp));
using (ISession s = OpenSession())
using (ITransaction t = s.BeginTransaction())
{
await (s.SaveAsync(ifa));
await (s.SaveAsync(jboss));
await (s.SaveAsync(gavin));
await (s.SaveAsync(emp));

IList l = await (s.CreateSQLQuery(OrgEmpRegionSQL)
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.AddScalar("regionCode", NHibernateUtil.String)
.ListAsync());
Assert.AreEqual(2, l.Count);

l = await (s.CreateSQLQuery(OrgEmpPersonSQL)
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.AddJoin("pers", "emp.employee")
.ListAsync());
Assert.AreEqual(l.Count, 1);

IList l = await (s.CreateSQLQuery(OrgEmpRegionSQL)
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.AddScalar("regionCode", NHibernateUtil.String)
.ListAsync());
Assert.AreEqual(2, l.Count);
await (t.CommitAsync());
}

l = await (s.CreateSQLQuery(OrgEmpPersonSQL)
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.AddJoin("pers", "emp.employee")
.ListAsync());
Assert.AreEqual(l.Count, 1);
using (var s = OpenSession())
using (var t = s.BeginTransaction())
{
var l = await (s.CreateSQLQuery(
"select {org.*}, {emp.*} " +
"from ORGANIZATION org " +
" left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER, ORGANIZATION org2")
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.SetResultTransformer(new DistinctRootEntityResultTransformer())
.ListAsync());
Assert.AreEqual(l.Count, 2);

await (t.CommitAsync());
s.Close();
await (t.CommitAsync());
s.Close();
}

s = OpenSession();
t = s.BeginTransaction();
using (var s = OpenSession())
using (var t = s.BeginTransaction())
{
await (s.DeleteAsync(emp));
await (s.DeleteAsync(gavin));
await (s.DeleteAsync(ifa));
await (s.DeleteAsync(jboss));

l = await (s.CreateSQLQuery(
"select {org.*}, {emp.*} " +
"from ORGANIZATION org " +
" left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER, ORGANIZATION org2")
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.SetResultTransformer(new DistinctRootEntityResultTransformer())
.ListAsync());
Assert.AreEqual(l.Count, 2);
await (t.CommitAsync());
s.Close();
}
}

await (t.CommitAsync());
s.Close();
[Test]
public async Task SQLQueryInterfaceCacheableAsync()
{
Organization ifa = new Organization("IFA");
Organization jboss = new Organization("JBoss");
Person gavin = new Person("Gavin");
Employment emp = new Employment(gavin, jboss, "AU");

s = OpenSession();
t = s.BeginTransaction();
using (ISession s = OpenSession())
using (ITransaction t = s.BeginTransaction())
{
await (s.SaveAsync(ifa));
await (s.SaveAsync(jboss));
await (s.SaveAsync(gavin));
await (s.SaveAsync(emp));

IList l = await (s.CreateSQLQuery(OrgEmpRegionSQL)
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.AddScalar("regionCode", NHibernateUtil.String)
.SetCacheable(true)
.ListAsync());
Assert.AreEqual(2, l.Count);

l = await (s.CreateSQLQuery(OrgEmpPersonSQL)
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.AddJoin("pers", "emp.employee")
.SetCacheable(true)
.ListAsync());
Assert.AreEqual(l.Count, 1);

await (s.DeleteAsync(emp));
await (s.DeleteAsync(gavin));
await (s.DeleteAsync(ifa));
await (s.DeleteAsync(jboss));
await (t.CommitAsync());
}

await (t.CommitAsync());
s.Close();
using (var s = OpenSession())
using (var t = s.BeginTransaction())
{
var l = await (s.CreateSQLQuery(
"select {org.*}, {emp.*} " +
"from ORGANIZATION org " +
" left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER, ORGANIZATION org2")
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.SetCacheable(true)
.SetResultTransformer(new DistinctRootEntityResultTransformer())
.ListAsync());
Assert.AreEqual(l.Count, 2);

await (t.CommitAsync());
s.Close();
}

using (var s = OpenSession())
using (var t = s.BeginTransaction())
{
await (s.DeleteAsync(emp));
await (s.DeleteAsync(gavin));
await (s.DeleteAsync(ifa));
await (s.DeleteAsync(jboss));

await (t.CommitAsync());
s.Close();
}
}

[Test]
Expand Down
151 changes: 110 additions & 41 deletions src/NHibernate.Test/SqlTest/Query/NativeSQLQueriesFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,61 +79,130 @@ public void FailOnNoAddEntityOrScalar()
[Test]
public void SQLQueryInterface()
{
ISession s = OpenSession();
ITransaction t = s.BeginTransaction();
Organization ifa = new Organization("IFA");
Organization jboss = new Organization("JBoss");
Person gavin = new Person("Gavin");
Employment emp = new Employment(gavin, jboss, "AU");

s.Save(ifa);
s.Save(jboss);
s.Save(gavin);
s.Save(emp);
using (ISession s = OpenSession())
using (ITransaction t = s.BeginTransaction())
{
s.Save(ifa);
s.Save(jboss);
s.Save(gavin);
s.Save(emp);

IList l = s.CreateSQLQuery(OrgEmpRegionSQL)
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.AddScalar("regionCode", NHibernateUtil.String)
.List();
Assert.AreEqual(2, l.Count);

l = s.CreateSQLQuery(OrgEmpPersonSQL)
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.AddJoin("pers", "emp.employee")
.List();
Assert.AreEqual(l.Count, 1);

IList l = s.CreateSQLQuery(OrgEmpRegionSQL)
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.AddScalar("regionCode", NHibernateUtil.String)
.List();
Assert.AreEqual(2, l.Count);
t.Commit();
}

l = s.CreateSQLQuery(OrgEmpPersonSQL)
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.AddJoin("pers", "emp.employee")
.List();
Assert.AreEqual(l.Count, 1);
using (var s = OpenSession())
using (var t = s.BeginTransaction())
{
var l = s.CreateSQLQuery(
"select {org.*}, {emp.*} " +
"from ORGANIZATION org " +
" left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER, ORGANIZATION org2")
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.SetResultTransformer(new DistinctRootEntityResultTransformer())
.List();
Assert.AreEqual(l.Count, 2);

t.Commit();
s.Close();
t.Commit();
s.Close();
}

s = OpenSession();
t = s.BeginTransaction();
using (var s = OpenSession())
using (var t = s.BeginTransaction())
{
s.Delete(emp);
s.Delete(gavin);
s.Delete(ifa);
s.Delete(jboss);

l = s.CreateSQLQuery(
"select {org.*}, {emp.*} " +
"from ORGANIZATION org " +
" left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER, ORGANIZATION org2")
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.SetResultTransformer(new DistinctRootEntityResultTransformer())
.List();
Assert.AreEqual(l.Count, 2);
t.Commit();
s.Close();
}
}

t.Commit();
s.Close();
[Test]
public void SQLQueryInterfaceCacheable()
{
Organization ifa = new Organization("IFA");
Organization jboss = new Organization("JBoss");
Person gavin = new Person("Gavin");
Employment emp = new Employment(gavin, jboss, "AU");

s = OpenSession();
t = s.BeginTransaction();
using (ISession s = OpenSession())
using (ITransaction t = s.BeginTransaction())
{
s.Save(ifa);
s.Save(jboss);
s.Save(gavin);
s.Save(emp);

IList l = s.CreateSQLQuery(OrgEmpRegionSQL)
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.AddScalar("regionCode", NHibernateUtil.String)
.SetCacheable(true)
.List();
Assert.AreEqual(2, l.Count);

l = s.CreateSQLQuery(OrgEmpPersonSQL)
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.AddJoin("pers", "emp.employee")
.SetCacheable(true)
.List();
Assert.AreEqual(l.Count, 1);

s.Delete(emp);
s.Delete(gavin);
s.Delete(ifa);
s.Delete(jboss);
t.Commit();
}

t.Commit();
s.Close();
using (var s = OpenSession())
using (var t = s.BeginTransaction())
{
var l = s.CreateSQLQuery(
"select {org.*}, {emp.*} " +
"from ORGANIZATION org " +
" left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER, ORGANIZATION org2")
.AddEntity("org", typeof(Organization))
.AddJoin("emp", "org.employments")
.SetCacheable(true)
.SetResultTransformer(new DistinctRootEntityResultTransformer())
.List();
Assert.AreEqual(l.Count, 2);

t.Commit();
s.Close();
}

using (var s = OpenSession())
using (var t = s.BeginTransaction())
{
s.Delete(emp);
s.Delete(gavin);
s.Delete(ifa);
s.Delete(jboss);

t.Commit();
s.Close();
}
}

[Test]
Expand Down
3 changes: 2 additions & 1 deletion src/NHibernate/Loader/Custom/CustomLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ public CustomLoader(ICustomQuery customQuery, ISessionFactoryImplementor factory
transformerAliases = specifiedAliases.ToArray();
rowProcessor = new ResultRowProcessor(hasScalars, resultColumnProcessors.ToArray());
includeInResultRow = includeInResultRowList.ToArray();
ResultRowAliases = transformerAliases.Where((a, i) => includeInResultRowList[i]).ToArray();
}

public ISet<string> QuerySpaces
Expand Down Expand Up @@ -297,7 +298,7 @@ protected override object[] GetResultRow(object[] row, DbDataReader rs, ISession
return rowProcessor.BuildResultRow(row, rs, session);
}

protected override string[] ResultRowAliases => transformerAliases;
protected override string[] ResultRowAliases { get; }

protected override IResultTransformer ResolveResultTransformer(IResultTransformer resultTransformer)
{
Expand Down