Menu
▾
▴
nhibernate-commit — CVS Commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(248) |
May
(82) |
Jun
(90) |
Jul
(177) |
Aug
(253) |
Sep
(157) |
Oct
(151) |
Nov
(143) |
Dec
(278) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(152) |
Feb
(107) |
Mar
(177) |
Apr
(133) |
May
(259) |
Jun
(81) |
Jul
(119) |
Aug
(306) |
Sep
(416) |
Oct
(240) |
Nov
(329) |
Dec
(206) |
| 2006 |
Jan
(466) |
Feb
(382) |
Mar
(153) |
Apr
(162) |
May
(133) |
Jun
(21) |
Jul
(18) |
Aug
(37) |
Sep
(97) |
Oct
(114) |
Nov
(110) |
Dec
(28) |
| 2007 |
Jan
(74) |
Feb
(65) |
Mar
(49) |
Apr
(76) |
May
(43) |
Jun
(15) |
Jul
(68) |
Aug
(55) |
Sep
(63) |
Oct
(59) |
Nov
(70) |
Dec
(66) |
| 2008 |
Jan
(71) |
Feb
(60) |
Mar
(120) |
Apr
(31) |
May
(48) |
Jun
(81) |
Jul
(107) |
Aug
(51) |
Sep
(80) |
Oct
(83) |
Nov
(83) |
Dec
(79) |
| 2009 |
Jan
(83) |
Feb
(110) |
Mar
(97) |
Apr
(91) |
May
(291) |
Jun
(250) |
Jul
(197) |
Aug
(58) |
Sep
(54) |
Oct
(122) |
Nov
(68) |
Dec
(34) |
| 2010 |
Jan
(50) |
Feb
(17) |
Mar
(63) |
Apr
(61) |
May
(84) |
Jun
(81) |
Jul
(138) |
Aug
(144) |
Sep
(78) |
Oct
(26) |
Nov
(30) |
Dec
(61) |
| 2011 |
Jan
(33) |
Feb
(35) |
Mar
(166) |
Apr
(221) |
May
(109) |
Jun
(76) |
Jul
(27) |
Aug
(37) |
Sep
(1) |
Oct
(4) |
Nov
(2) |
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
(2) |
Apr
(2) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
(3) |
Oct
(2) |
Nov
|
Dec
(1) |
| 2014 |
Jan
(1) |
Feb
(1) |
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <fab...@us...> - 2009-07-09 21:01:04
|
Revision: 4602
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4602&view=rev
Author: fabiomaulo
Date: 2009-07-09 21:00:59 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
Minimal relax of Mappings class
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Cfg/Mappings.cs
Modified: trunk/nhibernate/src/NHibernate/Cfg/Mappings.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Mappings.cs 2009-07-09 17:09:55 UTC (rev 4601)
+++ trunk/nhibernate/src/NHibernate/Cfg/Mappings.cs 2009-07-09 21:00:59 UTC (rev 4602)
@@ -156,20 +156,15 @@
collections[collection.Role] = collection;
}
- internal void AddUniquePropertyReference(string referencedClass, string propertyName)
+ public void AddUniquePropertyReference(string referencedClass, string propertyName)
{
- PropertyReference upr = new PropertyReference();
- upr.referencedClass = referencedClass;
- upr.propertyName = propertyName;
- upr.unique = true;
+ var upr = new PropertyReference {referencedClass = referencedClass, propertyName = propertyName, unique = true};
propertyReferences.Add(upr);
}
- internal void AddPropertyReference(string referencedClass, string propertyName)
+ public void AddPropertyReference(string referencedClass, string propertyName)
{
- PropertyReference upr = new PropertyReference();
- upr.referencedClass = referencedClass;
- upr.propertyName = propertyName;
+ var upr = new PropertyReference {referencedClass = referencedClass, propertyName = propertyName};
propertyReferences.Add(upr);
}
@@ -180,6 +175,11 @@
return result;
}
+ public Dialect.Dialect Dialect
+ {
+ get { return dialect; }
+ }
+
/// <summary>
///
/// </summary>
@@ -485,7 +485,7 @@
public void AddTypeDef(string typeName, string typeClass, IDictionary<string, string> paramMap)
{
- TypeDef def = new TypeDef(typeClass, paramMap);
+ var def = new TypeDef(typeClass, paramMap);
typeDefs[typeName] = def;
log.Debug("Added " + typeName + " with class " + typeClass);
}
@@ -582,7 +582,7 @@
private static string BuildTableNameKey(string schema, string catalog, string name)
{
- StringBuilder keyBuilder = new StringBuilder();
+ var keyBuilder = new StringBuilder();
if (schema != null)
keyBuilder.Append(schema);
keyBuilder.Append(".");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-09 17:09:58
|
Revision: 4601
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4601&view=rev
Author: fabiomaulo
Date: 2009-07-09 17:09:55 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
Missed test file in test prj.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-09 17:05:23 UTC (rev 4600)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-09 17:09:55 UTC (rev 4601)
@@ -348,6 +348,7 @@
<Compile Include="HQL\Ast\WithClauseFixture.cs" />
<Compile Include="HQL\Ast\Zoo.cs" />
<Compile Include="HQL\BaseFunctionFixture.cs" />
+ <Compile Include="IdTest\TableGeneratorFixture.cs" />
<Compile Include="LazyOneToOne\Employee.cs" />
<Compile Include="LazyOneToOne\Employment.cs" />
<Compile Include="LazyOneToOne\LazyOneToOneTest.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-09 17:05:28
|
Revision: 4600
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4600&view=rev
Author: fabiomaulo
Date: 2009-07-09 17:05:23 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
Merge r4598 and r4599 (fix NH-1876)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Id/TableGenerator.cs
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/IdTest/TableGeneratorFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Id/TableGenerator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Id/TableGenerator.cs 2009-07-09 16:45:16 UTC (rev 4599)
+++ trunk/nhibernate/src/NHibernate/Id/TableGenerator.cs 2009-07-09 17:05:23 UTC (rev 4600)
@@ -4,9 +4,9 @@
using System.Data;
using System.Runtime.CompilerServices;
using log4net;
+using NHibernate.AdoNet.Util;
using NHibernate.Dialect;
using NHibernate.Engine;
-using NHibernate.Engine.Transaction;
using NHibernate.SqlCommand;
using NHibernate.SqlTypes;
using NHibernate.Type;
@@ -14,9 +14,6 @@
namespace NHibernate.Id
{
- using System.Transactions;
- using NHibernate.AdoNet.Util;
-
/// <summary>
/// An <see cref="IIdentifierGenerator" /> that uses a database table to store the last
/// generated value.
@@ -38,7 +35,8 @@
/// </remarks>
public class TableGenerator : TransactionHelper, IPersistentIdentifierGenerator, IConfigurable
{
- private static readonly ILog log = LogManager.GetLogger(typeof(TableGenerator));
+ private static readonly ILog log = LogManager.GetLogger(typeof (TableGenerator));
+
/// <summary>
/// An additional where clause that is added to
/// the queries against the table.
@@ -83,7 +81,6 @@
/// <param name="dialect">The <see cref="Dialect"/> to help with Configuration.</param>
public virtual void Configure(IType type, IDictionary<string, string> parms, Dialect.Dialect dialect)
{
-
tableName = PropertiesHelper.GetString(TableParamName, parms, DefaultTableName);
columnName = PropertiesHelper.GetString(ColumnParamName, parms, DefaultColumnName);
whereClause = PropertiesHelper.GetString(Where, parms, "");
@@ -95,9 +92,17 @@
tableName = dialect.Qualify(catalogName, schemaName, tableName);
}
- query = "select " + columnName + " from " + dialect.AppendLockHint(LockMode.Upgrade, tableName)
- + dialect.ForUpdateString;
+ var selectBuilder = new SqlStringBuilder(100);
+ selectBuilder.Add("select " + columnName)
+ .Add(" from " + dialect.AppendLockHint(LockMode.Upgrade, tableName));
+ if (string.IsNullOrEmpty(whereClause) == false)
+ {
+ selectBuilder.Add(" where ").Add(whereClause);
+ }
+ selectBuilder.Add(dialect.ForUpdateString);
+ query = selectBuilder.ToString();
+
columnType = type as PrimitiveType;
if (columnType == null)
{
@@ -119,21 +124,16 @@
columnSqlType = SqlTypeFactory.Int32;
}
- parameterTypes = new SqlType[2] {columnSqlType, columnSqlType};
+ parameterTypes = new[] {columnSqlType, columnSqlType};
- SqlStringBuilder builder = new SqlStringBuilder();
+ var builder = new SqlStringBuilder(100);
builder.Add("update " + tableName + " set ")
- .Add(columnName)
- .Add(" = ")
- .Add(Parameter.Placeholder)
+ .Add(columnName).Add(" = ").Add(Parameter.Placeholder)
.Add(" where ")
- .Add(columnName)
- .Add(" = ")
- .Add(Parameter.Placeholder);
+ .Add(columnName).Add(" = ").Add(Parameter.Placeholder);
if (string.IsNullOrEmpty(whereClause) == false)
{
- builder.Add(" and ")
- .Add(whereClause);
+ builder.Add(" and ").Add(whereClause);
}
updateSql = builder.ToSqlString();
@@ -172,16 +172,16 @@
/// create the necessary database objects and to create the first value as <c>1</c>
/// for the TableGenerator.
/// </returns>
- public string[] SqlCreateStrings(Dialect.Dialect dialect)
+ public virtual string[] SqlCreateStrings(Dialect.Dialect dialect)
{
// changed the first value to be "1" by default since an uninitialized Int32 is 0 - leaving
// it at 0 would cause problems with an unsaved-value="0" which is what most people are
// defaulting <id>'s with Int32 types at.
- return new string[]
- {
- "create table " + tableName + " ( " + columnName + " " + dialect.GetTypeName(columnSqlType) + " )",
- "insert into " + tableName + " values ( 1 )"
- };
+ return new[]
+ {
+ "create table " + tableName + " ( " + columnName + " " + dialect.GetTypeName(columnSqlType) + " )",
+ "insert into " + tableName + " values ( 1 )"
+ };
}
/// <summary>
@@ -191,9 +191,9 @@
/// <returns>
/// A <see cref="string"/> that will drop the database objects for the TableGenerator.
/// </returns>
- public string[] SqlDropString(Dialect.Dialect dialect)
+ public virtual string[] SqlDropString(Dialect.Dialect dialect)
{
- return new string[] { dialect.GetDropTableString(tableName) };
+ return new[] {dialect.GetDropTableString(tableName)};
}
/// <summary>
@@ -209,7 +209,8 @@
#endregion
- public override object DoWorkInCurrentTransaction(ISessionImplementor session, IDbConnection conn, IDbTransaction transaction)
+ public override object DoWorkInCurrentTransaction(ISessionImplementor session, IDbConnection conn,
+ IDbTransaction transaction)
{
long result;
int rows;
@@ -243,15 +244,18 @@
}
finally
{
- if (rs != null) rs.Close();
+ if (rs != null)
+ {
+ rs.Close();
+ }
qps.Dispose();
}
- IDbCommand ups =
- session.Factory.ConnectionProvider.Driver.GenerateCommand(CommandType.Text, updateSql, parameterTypes);
+ IDbCommand ups = session.Factory.ConnectionProvider.Driver.GenerateCommand(CommandType.Text, updateSql,
+ parameterTypes);
ups.Connection = conn;
ups.Transaction = transaction;
-
+
try
{
columnType.Set(ups, result + 1, 0);
@@ -270,9 +274,10 @@
{
ups.Dispose();
}
- } while (rows == 0);
+ }
+ while (rows == 0);
return result;
}
}
-}
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate.Test/IdTest/TableGeneratorFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/IdTest/TableGeneratorFixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/IdTest/TableGeneratorFixture.cs 2009-07-09 17:05:23 UTC (rev 4600)
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.Reflection;
+using NHibernate.Dialect;
+using NHibernate.Id;
+using NUnit.Framework;
+
+namespace NHibernate.Test.IdTest
+{
+ [TestFixture]
+ public class TableGeneratorFixture
+ {
+ private const BindingFlags Flags =
+ BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly;
+
+ private readonly FieldInfo updateSql = typeof (TableGenerator).GetField("updateSql", Flags);
+ private readonly FieldInfo selectSql = typeof (TableGenerator).GetField("query", Flags);
+
+ [Test]
+ public void SelectAndUpdateStringContainCustomWhere()
+ {
+ const string customWhere = "table_name='second'";
+ var dialect = new MsSql2005Dialect();
+ var tg = new TableGenerator();
+ tg.Configure(NHibernateUtil.Int64, new Dictionary<string, string> {{"where", customWhere}}, dialect);
+ Assert.That(selectSql.GetValue(tg).ToString(), Text.Contains(customWhere));
+ Assert.That(updateSql.GetValue(tg).ToString(), Text.Contains(customWhere));
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-09 16:45:18
|
Revision: 4599
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4599&view=rev
Author: fabiomaulo
Date: 2009-07-09 16:45:16 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
Fix NH-1876
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Id/TableGenerator.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
branches/2.1.x/nhibernate/src/NHibernate.Test/IdTest/TableGeneratorFixture.cs
Modified: branches/2.1.x/nhibernate/src/NHibernate/Id/TableGenerator.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Id/TableGenerator.cs 2009-07-09 16:10:33 UTC (rev 4598)
+++ branches/2.1.x/nhibernate/src/NHibernate/Id/TableGenerator.cs 2009-07-09 16:45:16 UTC (rev 4599)
@@ -92,9 +92,17 @@
tableName = dialect.Qualify(catalogName, schemaName, tableName);
}
- query = "select " + columnName + " from " + dialect.AppendLockHint(LockMode.Upgrade, tableName)
- + dialect.ForUpdateString;
+ var selectBuilder = new SqlStringBuilder(100);
+ selectBuilder.Add("select " + columnName)
+ .Add(" from " + dialect.AppendLockHint(LockMode.Upgrade, tableName));
+ if (string.IsNullOrEmpty(whereClause) == false)
+ {
+ selectBuilder.Add(" where ").Add(whereClause);
+ }
+ selectBuilder.Add(dialect.ForUpdateString);
+ query = selectBuilder.ToString();
+
columnType = type as PrimitiveType;
if (columnType == null)
{
@@ -118,9 +126,11 @@
parameterTypes = new[] {columnSqlType, columnSqlType};
- var builder = new SqlStringBuilder();
- builder.Add("update " + tableName + " set ").Add(columnName).Add(" = ").Add(Parameter.Placeholder).Add(" where ").Add
- (columnName).Add(" = ").Add(Parameter.Placeholder);
+ var builder = new SqlStringBuilder(100);
+ builder.Add("update " + tableName + " set ")
+ .Add(columnName).Add(" = ").Add(Parameter.Placeholder)
+ .Add(" where ")
+ .Add(columnName).Add(" = ").Add(Parameter.Placeholder);
if (string.IsNullOrEmpty(whereClause) == false)
{
builder.Add(" and ").Add(whereClause);
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/IdTest/TableGeneratorFixture.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/IdTest/TableGeneratorFixture.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/IdTest/TableGeneratorFixture.cs 2009-07-09 16:45:16 UTC (rev 4599)
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.Reflection;
+using NHibernate.Dialect;
+using NHibernate.Id;
+using NUnit.Framework;
+
+namespace NHibernate.Test.IdTest
+{
+ [TestFixture]
+ public class TableGeneratorFixture
+ {
+ private const BindingFlags Flags =
+ BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly;
+
+ private readonly FieldInfo updateSql = typeof (TableGenerator).GetField("updateSql", Flags);
+ private readonly FieldInfo selectSql = typeof (TableGenerator).GetField("query", Flags);
+
+ [Test]
+ public void SelectAndUpdateStringContainCustomWhere()
+ {
+ const string customWhere = "table_name='second'";
+ var dialect = new MsSql2005Dialect();
+ var tg = new TableGenerator();
+ tg.Configure(NHibernateUtil.Int64, new Dictionary<string, string> {{"where", customWhere}}, dialect);
+ Assert.That(selectSql.GetValue(tg).ToString(), Text.Contains(customWhere));
+ Assert.That(updateSql.GetValue(tg).ToString(), Text.Contains(customWhere));
+ }
+ }
+}
\ No newline at end of file
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-09 16:10:33 UTC (rev 4598)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-09 16:45:16 UTC (rev 4599)
@@ -341,6 +341,7 @@
<Compile Include="HQL\Ast\WithClauseFixture.cs" />
<Compile Include="HQL\Ast\Zoo.cs" />
<Compile Include="HQL\BaseFunctionFixture.cs" />
+ <Compile Include="IdTest\TableGeneratorFixture.cs" />
<Compile Include="LazyOneToOne\Employee.cs" />
<Compile Include="LazyOneToOne\Employment.cs" />
<Compile Include="LazyOneToOne\LazyOneToOneTest.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-09 16:10:41
|
Revision: 4598
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4598&view=rev
Author: fabiomaulo
Date: 2009-07-09 16:10:33 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
Minor (reformatting)
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Id/TableGenerator.cs
Modified: branches/2.1.x/nhibernate/src/NHibernate/Id/TableGenerator.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Id/TableGenerator.cs 2009-07-09 15:31:05 UTC (rev 4597)
+++ branches/2.1.x/nhibernate/src/NHibernate/Id/TableGenerator.cs 2009-07-09 16:10:33 UTC (rev 4598)
@@ -4,9 +4,9 @@
using System.Data;
using System.Runtime.CompilerServices;
using log4net;
+using NHibernate.AdoNet.Util;
using NHibernate.Dialect;
using NHibernate.Engine;
-using NHibernate.Engine.Transaction;
using NHibernate.SqlCommand;
using NHibernate.SqlTypes;
using NHibernate.Type;
@@ -14,9 +14,6 @@
namespace NHibernate.Id
{
- using System.Transactions;
- using NHibernate.AdoNet.Util;
-
/// <summary>
/// An <see cref="IIdentifierGenerator" /> that uses a database table to store the last
/// generated value.
@@ -38,7 +35,8 @@
/// </remarks>
public class TableGenerator : TransactionHelper, IPersistentIdentifierGenerator, IConfigurable
{
- private static readonly ILog log = LogManager.GetLogger(typeof(TableGenerator));
+ private static readonly ILog log = LogManager.GetLogger(typeof (TableGenerator));
+
/// <summary>
/// An additional where clause that is added to
/// the queries against the table.
@@ -83,7 +81,6 @@
/// <param name="dialect">The <see cref="Dialect"/> to help with Configuration.</param>
public virtual void Configure(IType type, IDictionary<string, string> parms, Dialect.Dialect dialect)
{
-
tableName = PropertiesHelper.GetString(TableParamName, parms, DefaultTableName);
columnName = PropertiesHelper.GetString(ColumnParamName, parms, DefaultColumnName);
whereClause = PropertiesHelper.GetString(Where, parms, "");
@@ -119,21 +116,14 @@
columnSqlType = SqlTypeFactory.Int32;
}
- parameterTypes = new SqlType[2] {columnSqlType, columnSqlType};
+ parameterTypes = new[] {columnSqlType, columnSqlType};
- SqlStringBuilder builder = new SqlStringBuilder();
- builder.Add("update " + tableName + " set ")
- .Add(columnName)
- .Add(" = ")
- .Add(Parameter.Placeholder)
- .Add(" where ")
- .Add(columnName)
- .Add(" = ")
- .Add(Parameter.Placeholder);
+ var builder = new SqlStringBuilder();
+ builder.Add("update " + tableName + " set ").Add(columnName).Add(" = ").Add(Parameter.Placeholder).Add(" where ").Add
+ (columnName).Add(" = ").Add(Parameter.Placeholder);
if (string.IsNullOrEmpty(whereClause) == false)
{
- builder.Add(" and ")
- .Add(whereClause);
+ builder.Add(" and ").Add(whereClause);
}
updateSql = builder.ToSqlString();
@@ -172,16 +162,16 @@
/// create the necessary database objects and to create the first value as <c>1</c>
/// for the TableGenerator.
/// </returns>
- public string[] SqlCreateStrings(Dialect.Dialect dialect)
+ public virtual string[] SqlCreateStrings(Dialect.Dialect dialect)
{
// changed the first value to be "1" by default since an uninitialized Int32 is 0 - leaving
// it at 0 would cause problems with an unsaved-value="0" which is what most people are
// defaulting <id>'s with Int32 types at.
- return new string[]
- {
- "create table " + tableName + " ( " + columnName + " " + dialect.GetTypeName(columnSqlType) + " )",
- "insert into " + tableName + " values ( 1 )"
- };
+ return new[]
+ {
+ "create table " + tableName + " ( " + columnName + " " + dialect.GetTypeName(columnSqlType) + " )",
+ "insert into " + tableName + " values ( 1 )"
+ };
}
/// <summary>
@@ -191,9 +181,9 @@
/// <returns>
/// A <see cref="string"/> that will drop the database objects for the TableGenerator.
/// </returns>
- public string[] SqlDropString(Dialect.Dialect dialect)
+ public virtual string[] SqlDropString(Dialect.Dialect dialect)
{
- return new string[] { dialect.GetDropTableString(tableName) };
+ return new[] {dialect.GetDropTableString(tableName)};
}
/// <summary>
@@ -209,7 +199,8 @@
#endregion
- public override object DoWorkInCurrentTransaction(ISessionImplementor session, IDbConnection conn, IDbTransaction transaction)
+ public override object DoWorkInCurrentTransaction(ISessionImplementor session, IDbConnection conn,
+ IDbTransaction transaction)
{
long result;
int rows;
@@ -243,15 +234,18 @@
}
finally
{
- if (rs != null) rs.Close();
+ if (rs != null)
+ {
+ rs.Close();
+ }
qps.Dispose();
}
- IDbCommand ups =
- session.Factory.ConnectionProvider.Driver.GenerateCommand(CommandType.Text, updateSql, parameterTypes);
+ IDbCommand ups = session.Factory.ConnectionProvider.Driver.GenerateCommand(CommandType.Text, updateSql,
+ parameterTypes);
ups.Connection = conn;
ups.Transaction = transaction;
-
+
try
{
columnType.Set(ups, result + 1, 0);
@@ -270,9 +264,10 @@
{
ups.Dispose();
}
- } while (rows == 0);
+ }
+ while (rows == 0);
return result;
}
}
-}
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-09 15:31:09
|
Revision: 4597
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4597&view=rev
Author: fabiomaulo
Date: 2009-07-09 15:31:05 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
Merge r4596 (fix NH-1872 by Erik Petersen)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Driver/OdbcDriver.cs
Modified: trunk/nhibernate/src/NHibernate/Driver/OdbcDriver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Driver/OdbcDriver.cs 2009-07-09 15:27:05 UTC (rev 4596)
+++ trunk/nhibernate/src/NHibernate/Driver/OdbcDriver.cs 2009-07-09 15:31:05 UTC (rev 4597)
@@ -1,6 +1,8 @@
using System;
using System.Data;
using System.Data.Odbc;
+using NHibernate.SqlCommand;
+using NHibernate.SqlTypes;
namespace NHibernate.Driver
{
@@ -40,5 +42,39 @@
{
get { return String.Empty; }
}
+
+ private static void SetVariableLengthParameterSize(IDbDataParameter dbParam, SqlType sqlType)
+ {
+ // Override the defaults using data from SqlType.
+ if (sqlType.LengthDefined)
+ {
+ dbParam.Size = sqlType.Length;
+ }
+
+ if (sqlType.PrecisionDefined)
+ {
+ dbParam.Precision = sqlType.Precision;
+ dbParam.Scale = sqlType.Scale;
+ }
+ }
+
+ public static void SetParameterSizes(IDataParameterCollection parameters, SqlType[] parameterTypes)
+ {
+ for (int i = 0; i < parameters.Count; i++)
+ {
+ SetVariableLengthParameterSize((IDbDataParameter)parameters[i], parameterTypes[i]);
+ }
+ }
+
+ public override IDbCommand GenerateCommand(CommandType type, SqlString sqlString, SqlType[] parameterTypes)
+ {
+ IDbCommand command = base.GenerateCommand(type, sqlString, parameterTypes);
+ if (IsPrepareSqlEnabled)
+ {
+ SetParameterSizes(command.Parameters, parameterTypes);
+ }
+ return command;
+ }
+
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-09 15:27:08
|
Revision: 4596
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4596&view=rev
Author: fabiomaulo
Date: 2009-07-09 15:27:05 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
Fix NH-1872 by Erik Petersen
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Driver/OdbcDriver.cs
Modified: branches/2.1.x/nhibernate/src/NHibernate/Driver/OdbcDriver.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Driver/OdbcDriver.cs 2009-07-09 11:32:22 UTC (rev 4595)
+++ branches/2.1.x/nhibernate/src/NHibernate/Driver/OdbcDriver.cs 2009-07-09 15:27:05 UTC (rev 4596)
@@ -1,6 +1,8 @@
using System;
using System.Data;
using System.Data.Odbc;
+using NHibernate.SqlCommand;
+using NHibernate.SqlTypes;
namespace NHibernate.Driver
{
@@ -12,10 +14,6 @@
/// </remarks>
public class OdbcDriver : DriverBase
{
- public OdbcDriver()
- {
- }
-
public override IDbConnection CreateConnection()
{
return new OdbcConnection();
@@ -40,5 +38,38 @@
{
get { return String.Empty; }
}
+
+ private static void SetVariableLengthParameterSize(IDbDataParameter dbParam, SqlType sqlType)
+ {
+ // Override the defaults using data from SqlType.
+ if (sqlType.LengthDefined)
+ {
+ dbParam.Size = sqlType.Length;
+ }
+
+ if (sqlType.PrecisionDefined)
+ {
+ dbParam.Precision = sqlType.Precision;
+ dbParam.Scale = sqlType.Scale;
+ }
+ }
+
+ public static void SetParameterSizes(IDataParameterCollection parameters, SqlType[] parameterTypes)
+ {
+ for (int i = 0; i < parameters.Count; i++)
+ {
+ SetVariableLengthParameterSize((IDbDataParameter)parameters[i], parameterTypes[i]);
+ }
+ }
+
+ public override IDbCommand GenerateCommand(CommandType type, SqlString sqlString, SqlType[] parameterTypes)
+ {
+ IDbCommand command = base.GenerateCommand(type, sqlString, parameterTypes);
+ if (IsPrepareSqlEnabled)
+ {
+ SetParameterSizes(command.Parameters, parameterTypes);
+ }
+ return command;
+ }
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2009-07-09 11:32:27
|
Revision: 4595
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4595&view=rev
Author: tehlike
Date: 2009-07-09 11:32:22 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
Merging the fix for NH-1877
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Criterion/Projections.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs
Property Changed:
----------------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Customer.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/
Copied: trunk/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs (from rev 4594, branches/2.1.x/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs)
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs 2009-07-09 11:32:22 UTC (rev 4595)
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NHibernate.Engine;
+using NHibernate.SqlCommand;
+using NHibernate.Type;
+using NHibernate.Util;
+
+namespace NHibernate.Criterion
+{
+ [Serializable]
+ public class GroupedProjection:IProjection
+ {
+ private readonly IProjection projection;
+
+ public GroupedProjection(IProjection projection)
+ {
+ this.projection = projection;
+ }
+
+ public virtual SqlString ToSqlString(ICriteria criteria, int position, ICriteriaQuery criteriaQuery, IDictionary<string, IFilter> enabledFilters)
+ {
+ return projection.ToSqlString(criteria, position, criteriaQuery, enabledFilters);
+ }
+
+ public virtual SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery criteriaQuery, IDictionary<string, IFilter> enabledFilters)
+ {
+ return StringHelper.RemoveAsAliasesFromSql(this.projection.ToSqlString(criteria, 0, criteriaQuery, enabledFilters));
+ }
+
+ public virtual IType[] GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuery)
+ {
+ return projection.GetTypes(criteria, criteriaQuery);
+ }
+
+ public virtual IType[] GetTypes(String alias, ICriteria criteria, ICriteriaQuery criteriaQuery)
+ {
+ return this.projection.GetTypes(alias,criteria,criteriaQuery);
+ }
+
+ public virtual string[] GetColumnAliases(int loc)
+ {
+ return projection.GetColumnAliases(loc);
+ }
+
+ public virtual string[] GetColumnAliases(string alias, int loc)
+ {
+ return null;
+ }
+
+ public virtual string[] Aliases
+ {
+ get { return new string[] { }; }
+ }
+
+ public virtual bool IsGrouped
+ {
+ get { return true; }
+ }
+
+ public bool IsAggregate
+ {
+ get { return projection.IsAggregate; }
+ }
+
+ /// <summary>
+ /// Gets the typed values for parameters in this projection
+ /// </summary>
+ /// <param name="criteria">The criteria.</param>
+ /// <param name="criteriaQuery">The criteria query.</param>
+ /// <returns></returns>
+ public TypedValue[] GetTypedValues(ICriteria criteria, ICriteriaQuery criteriaQuery)
+ {
+ return projection.GetTypedValues(criteria, criteriaQuery);
+ }
+
+ public override string ToString()
+ {
+ return projection.ToString();
+ }
+ }
+}
Modified: trunk/nhibernate/src/NHibernate/Criterion/Projections.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/Projections.cs 2009-07-09 10:46:19 UTC (rev 4594)
+++ trunk/nhibernate/src/NHibernate/Criterion/Projections.cs 2009-07-09 11:32:22 UTC (rev 4595)
@@ -202,6 +202,16 @@
}
/// <summary>
+ /// A grouping projection value
+ /// </summary>
+ /// <param name="projection"></param>
+ /// <returns></returns>
+ public static GroupedProjection GroupProperty(IProjection projection)
+ {
+ return new GroupedProjection(projection);
+ }
+
+ /// <summary>
/// A projected property value
/// </summary>
/// <param name="propertyName"></param>
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-07-09 10:46:19 UTC (rev 4594)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-07-09 11:32:22 UTC (rev 4595)
@@ -485,6 +485,7 @@
<Compile Include="Cfg\MappingSchema\HbmTimestamp.cs" />
<Compile Include="Cfg\MappingSchema\HbmVersion.cs" />
<Compile Include="Cfg\MappingSchema\IDecoratable.cs" />
+ <Compile Include="Criterion\GroupedProjection.cs" />
<Compile Include="Criterion\IPropertyProjection.cs" />
<Compile Include="Criterion\QueryOverJoinBuilder.cs" />
<Compile Include="Dialect\MsSql2008Dialect.cs" />
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Customer.cs
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Customer.cs:4593-4594
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Fixture.cs
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Fixture.cs:4593-4594
Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Mappings.hbm.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Mappings.hbm.xml:4593-4594
Deleted: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs 2009-07-09 10:46:19 UTC (rev 4594)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs 2009-07-09 11:32:22 UTC (rev 4595)
@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NHibernate.Criterion;
-using NUnit.Framework;
-
-namespace NHibernate.Test.NHSpecificTest.NH1877
-{
- [TestFixture]
- public class Fixture : BugTestCase
- {
- protected override void OnSetUp()
- {
- using(var session=OpenSession())
- using(var tran=session.BeginTransaction())
- {
- session.Save(new Person {BirthDate = new DateTime(1988, 7, 21)});
- session.Save(new Person { BirthDate = new DateTime(1987, 7, 22) });
- session.Save(new Person { BirthDate = new DateTime(1986, 7, 23) });
- session.Save(new Person { BirthDate = new DateTime(1987, 7, 24) });
- session.Save(new Person { BirthDate = new DateTime(1988, 7, 25) });
- tran.Commit();
- }
- }
-
- protected override void OnTearDown()
- {
- using (var session = OpenSession())
- using (var tran = session.BeginTransaction())
- {
- session.CreateQuery("delete from Person").ExecuteUpdate();
- tran.Commit();
- }
- }
-
- [Test]
- public void CanGroupByWithPropertyName()
- {
- using(var session=OpenSession())
- {
- var crit = session.CreateCriteria(typeof (Person))
- .SetProjection(Projections.GroupProperty("BirthDate"),
- Projections.Count("Id"));
- var result = crit.List();
- Assert.That(result,Has.Count.EqualTo(5));
- }
- }
-
- [Test]
- public void CanGroupByWithSqlFunctionProjection()
- {
- using (var session = OpenSession())
- {
- var crit = session.CreateCriteria(typeof (Person))
- .SetProjection(
- Projections.GroupProperty(Projections.SqlFunction("month", NHibernateUtil.Int32, Projections.Property("BirthDate"))));
-
- var result = crit.UniqueResult();
- Assert.That(result,Is.EqualTo(7));
- }
- }
- }
-}
\ No newline at end of file
Copied: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs (from rev 4594, branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs)
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs 2009-07-09 11:32:22 UTC (rev 4595)
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NHibernate.Criterion;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1877
+{
+ [TestFixture]
+ public class Fixture : BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ using(var session=OpenSession())
+ using(var tran=session.BeginTransaction())
+ {
+ session.Save(new Person {BirthDate = new DateTime(1988, 7, 21)});
+ session.Save(new Person { BirthDate = new DateTime(1987, 7, 22) });
+ session.Save(new Person { BirthDate = new DateTime(1986, 7, 23) });
+ session.Save(new Person { BirthDate = new DateTime(1987, 7, 24) });
+ session.Save(new Person { BirthDate = new DateTime(1988, 7, 25) });
+ tran.Commit();
+ }
+ }
+
+ protected override void OnTearDown()
+ {
+ using (var session = OpenSession())
+ using (var tran = session.BeginTransaction())
+ {
+ session.CreateQuery("delete from Person").ExecuteUpdate();
+ tran.Commit();
+ }
+ }
+
+ [Test]
+ public void CanGroupByWithPropertyName()
+ {
+ using(var session=OpenSession())
+ {
+ var crit = session.CreateCriteria(typeof (Person))
+ .SetProjection(Projections.GroupProperty("BirthDate"),
+ Projections.Count("Id"));
+ var result = crit.List();
+ Assert.That(result,Has.Count.EqualTo(5));
+ }
+ }
+
+ [Test]
+ public void CanGroupByWithSqlFunctionProjection()
+ {
+ using (var session = OpenSession())
+ {
+ var crit = session.CreateCriteria(typeof (Person))
+ .SetProjection(
+ Projections.GroupProperty(Projections.SqlFunction("month", NHibernateUtil.Int32, Projections.Property("BirthDate"))));
+
+ var result = crit.UniqueResult();
+ Assert.That(result,Is.EqualTo(7));
+ }
+ }
+ }
+}
\ No newline at end of file
Deleted: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml 2009-07-09 10:46:19 UTC (rev 4594)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml 2009-07-09 11:32:22 UTC (rev 4595)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
- namespace="NHibernate.Test.NHSpecificTest.NH1877"
- default-lazy="false">
-
- <class name="Person">
- <id name="Id">
- <generator class="hilo"/>
- </id>
- <property name="BirthDate"/>
-
- </class>
-</hibernate-mapping>
\ No newline at end of file
Copied: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml (from rev 4594, branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml)
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml 2009-07-09 11:32:22 UTC (rev 4595)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1877"
+ default-lazy="false">
+
+ <class name="Person">
+ <id name="Id">
+ <generator class="hilo"/>
+ </id>
+ <property name="BirthDate"/>
+
+ </class>
+</hibernate-mapping>
\ No newline at end of file
Deleted: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs 2009-07-09 10:46:19 UTC (rev 4594)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs 2009-07-09 11:32:22 UTC (rev 4595)
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NHibernate.Test.NHSpecificTest.NH1877
-{
- public class Person
- {
- public virtual long Id { get; set; }
- public virtual DateTime BirthDate { get; set; }
- }
-}
Copied: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs (from rev 4594, branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs)
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs 2009-07-09 11:32:22 UTC (rev 4595)
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH1877
+{
+ public class Person
+ {
+ public virtual long Id { get; set; }
+ public virtual DateTime BirthDate { get; set; }
+ }
+}
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-09 10:46:19 UTC (rev 4594)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-09 11:32:22 UTC (rev 4595)
@@ -542,6 +542,8 @@
<Compile Include="NHSpecificTest\NH1867\AddMappingTest.cs" />
<Compile Include="NHSpecificTest\NH1868\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1868\Model.cs" />
+ <Compile Include="NHSpecificTest\NH1877\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1877\Person.cs" />
<Compile Include="NHSpecificTest\NH473\Child.cs" />
<Compile Include="NHSpecificTest\NH473\Fixture.cs" />
<Compile Include="NHSpecificTest\NH473\Parent.cs" />
@@ -1953,6 +1955,7 @@
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<EmbeddedResource Include="Criteria\Lambda\Mappings.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1877\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1868\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1857\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1859\Mappings.hbm.xml" />
Property changes on: trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.1.x/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests:4507-4508,4510-4513,4537-4538
+ /branches/2.1.x/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests:4507-4508,4510-4513,4537-4538,4593-4594
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2009-07-09 10:46:23
|
Revision: 4594
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4594&view=rev
Author: tehlike
Date: 2009-07-09 10:46:19 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
Fixing my broken commit.
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs
Modified: branches/2.1.x/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs 2009-07-09 10:00:00 UTC (rev 4593)
+++ branches/2.1.x/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs 2009-07-09 10:46:19 UTC (rev 4594)
@@ -8,6 +8,7 @@
namespace NHibernate.Criterion
{
+ [Serializable]
public class GroupedProjection:IProjection
{
private readonly IProjection projection;
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs 2009-07-09 10:00:00 UTC (rev 4593)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs 2009-07-09 10:46:19 UTC (rev 4594)
@@ -56,7 +56,6 @@
Projections.GroupProperty(Projections.SqlFunction("month", NHibernateUtil.Int32, Projections.Property("BirthDate"))));
var result = crit.UniqueResult();
- Assert.That(result, Has.Count.EqualTo(1));
Assert.That(result,Is.EqualTo(7));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2009-07-09 10:00:12
|
Revision: 4593
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4593&view=rev
Author: tehlike
Date: 2009-07-09 10:00:00 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
Fix for NH-1877
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Criterion/Projections.cs
branches/2.1.x/nhibernate/src/NHibernate/NHibernate.csproj
branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
branches/2.1.x/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs
Added: branches/2.1.x/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate/Criterion/GroupedProjection.cs 2009-07-09 10:00:00 UTC (rev 4593)
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NHibernate.Engine;
+using NHibernate.SqlCommand;
+using NHibernate.Type;
+using NHibernate.Util;
+
+namespace NHibernate.Criterion
+{
+ public class GroupedProjection:IProjection
+ {
+ private readonly IProjection projection;
+
+ public GroupedProjection(IProjection projection)
+ {
+ this.projection = projection;
+ }
+
+ public virtual SqlString ToSqlString(ICriteria criteria, int position, ICriteriaQuery criteriaQuery, IDictionary<string, IFilter> enabledFilters)
+ {
+ return projection.ToSqlString(criteria, position, criteriaQuery, enabledFilters);
+ }
+
+ public virtual SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery criteriaQuery, IDictionary<string, IFilter> enabledFilters)
+ {
+ return StringHelper.RemoveAsAliasesFromSql(this.projection.ToSqlString(criteria, 0, criteriaQuery, enabledFilters));
+ }
+
+ public virtual IType[] GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuery)
+ {
+ return projection.GetTypes(criteria, criteriaQuery);
+ }
+
+ public virtual IType[] GetTypes(String alias, ICriteria criteria, ICriteriaQuery criteriaQuery)
+ {
+ return this.projection.GetTypes(alias,criteria,criteriaQuery);
+ }
+
+ public virtual string[] GetColumnAliases(int loc)
+ {
+ return projection.GetColumnAliases(loc);
+ }
+
+ public virtual string[] GetColumnAliases(string alias, int loc)
+ {
+ return null;
+ }
+
+ public virtual string[] Aliases
+ {
+ get { return new string[] { }; }
+ }
+
+ public virtual bool IsGrouped
+ {
+ get { return true; }
+ }
+
+ public bool IsAggregate
+ {
+ get { return projection.IsAggregate; }
+ }
+
+ /// <summary>
+ /// Gets the typed values for parameters in this projection
+ /// </summary>
+ /// <param name="criteria">The criteria.</param>
+ /// <param name="criteriaQuery">The criteria query.</param>
+ /// <returns></returns>
+ public TypedValue[] GetTypedValues(ICriteria criteria, ICriteriaQuery criteriaQuery)
+ {
+ return projection.GetTypedValues(criteria, criteriaQuery);
+ }
+
+ public override string ToString()
+ {
+ return projection.ToString();
+ }
+ }
+}
Modified: branches/2.1.x/nhibernate/src/NHibernate/Criterion/Projections.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Criterion/Projections.cs 2009-07-08 17:07:02 UTC (rev 4592)
+++ branches/2.1.x/nhibernate/src/NHibernate/Criterion/Projections.cs 2009-07-09 10:00:00 UTC (rev 4593)
@@ -202,6 +202,16 @@
}
/// <summary>
+ /// A grouping projection value
+ /// </summary>
+ /// <param name="projection"></param>
+ /// <returns></returns>
+ public static GroupedProjection GroupProperty(IProjection projection)
+ {
+ return new GroupedProjection(projection);
+ }
+
+ /// <summary>
/// A projected property value
/// </summary>
/// <param name="propertyName"></param>
Modified: branches/2.1.x/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/NHibernate.csproj 2009-07-08 17:07:02 UTC (rev 4592)
+++ branches/2.1.x/nhibernate/src/NHibernate/NHibernate.csproj 2009-07-09 10:00:00 UTC (rev 4593)
@@ -460,6 +460,7 @@
<Compile Include="Cfg\MappingSchema\HbmTimestamp.cs" />
<Compile Include="Cfg\MappingSchema\HbmVersion.cs" />
<Compile Include="Cfg\MappingSchema\IDecoratable.cs" />
+ <Compile Include="Criterion\GroupedProjection.cs" />
<Compile Include="Criterion\IPropertyProjection.cs" />
<Compile Include="Dialect\MsSql2008Dialect.cs" />
<Compile Include="Dialect\InformixDialect0940.cs" />
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Fixture.cs 2009-07-09 10:00:00 UTC (rev 4593)
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NHibernate.Criterion;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1877
+{
+ [TestFixture]
+ public class Fixture : BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ using(var session=OpenSession())
+ using(var tran=session.BeginTransaction())
+ {
+ session.Save(new Person {BirthDate = new DateTime(1988, 7, 21)});
+ session.Save(new Person { BirthDate = new DateTime(1987, 7, 22) });
+ session.Save(new Person { BirthDate = new DateTime(1986, 7, 23) });
+ session.Save(new Person { BirthDate = new DateTime(1987, 7, 24) });
+ session.Save(new Person { BirthDate = new DateTime(1988, 7, 25) });
+ tran.Commit();
+ }
+ }
+
+ protected override void OnTearDown()
+ {
+ using (var session = OpenSession())
+ using (var tran = session.BeginTransaction())
+ {
+ session.CreateQuery("delete from Person").ExecuteUpdate();
+ tran.Commit();
+ }
+ }
+
+ [Test]
+ public void CanGroupByWithPropertyName()
+ {
+ using(var session=OpenSession())
+ {
+ var crit = session.CreateCriteria(typeof (Person))
+ .SetProjection(Projections.GroupProperty("BirthDate"),
+ Projections.Count("Id"));
+ var result = crit.List();
+ Assert.That(result,Has.Count.EqualTo(5));
+ }
+ }
+
+ [Test]
+ public void CanGroupByWithSqlFunctionProjection()
+ {
+ using (var session = OpenSession())
+ {
+ var crit = session.CreateCriteria(typeof (Person))
+ .SetProjection(
+ Projections.GroupProperty(Projections.SqlFunction("month", NHibernateUtil.Int32, Projections.Property("BirthDate"))));
+
+ var result = crit.UniqueResult();
+ Assert.That(result, Has.Count.EqualTo(1));
+ Assert.That(result,Is.EqualTo(7));
+ }
+ }
+ }
+}
\ No newline at end of file
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Mappings.hbm.xml 2009-07-09 10:00:00 UTC (rev 4593)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1877"
+ default-lazy="false">
+
+ <class name="Person">
+ <id name="Id">
+ <generator class="hilo"/>
+ </id>
+ <property name="BirthDate"/>
+
+ </class>
+</hibernate-mapping>
\ No newline at end of file
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1877/Person.cs 2009-07-09 10:00:00 UTC (rev 4593)
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH1877
+{
+ public class Person
+ {
+ public virtual long Id { get; set; }
+ public virtual DateTime BirthDate { get; set; }
+ }
+}
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-08 17:07:02 UTC (rev 4592)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-09 10:00:00 UTC (rev 4593)
@@ -535,6 +535,8 @@
<Compile Include="NHSpecificTest\NH1867\AddMappingTest.cs" />
<Compile Include="NHSpecificTest\NH1868\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1868\Model.cs" />
+ <Compile Include="NHSpecificTest\NH1877\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1877\Person.cs" />
<Compile Include="NHSpecificTest\NH473\Child.cs" />
<Compile Include="NHSpecificTest\NH473\Fixture.cs" />
<Compile Include="NHSpecificTest\NH473\Parent.cs" />
@@ -1945,6 +1947,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1877\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1868\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1849\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1857\Mappings.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ric...@us...> - 2009-07-08 17:07:08
|
Revision: 4592
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4592&view=rev
Author: ricbrown
Date: 2009-07-08 17:07:02 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Added overloads for creating sub-criteria with alias and join types.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
trunk/nhibernate/src/NHibernate/Criterion/QueryOverJoinBuilder.cs
trunk/nhibernate/src/NHibernate/IQueryOver.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/Model.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-08 15:34:48 UTC (rev 4591)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-08 17:07:02 UTC (rev 4592)
@@ -89,6 +89,39 @@
ExpressionProcessor.FindMemberExpression(path.Body)));
}
+ public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path, Expression<Func<U>> alias)
+ {
+ return new QueryOver<U>(_impl,
+ _criteria.CreateCriteria(
+ ExpressionProcessor.FindMemberExpression(path.Body),
+ ExpressionProcessor.FindMemberExpression(alias.Body)));
+ }
+
+ public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path, JoinType joinType)
+ {
+ return new QueryOver<U>(_impl,
+ _criteria.CreateCriteria(
+ ExpressionProcessor.FindMemberExpression(path.Body),
+ joinType));
+ }
+
+ public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path, Expression<Func<U>> alias, JoinType joinType)
+ {
+ return new QueryOver<U>(_impl,
+ _criteria.CreateCriteria(
+ ExpressionProcessor.FindMemberExpression(path.Body),
+ ExpressionProcessor.FindMemberExpression(alias.Body),
+ joinType));
+ }
+
+ public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, Expression<Func<U>> alias)
+ {
+ return new QueryOver<U>(_impl,
+ _criteria.CreateCriteria(
+ ExpressionProcessor.FindMemberExpression(path.Body),
+ ExpressionProcessor.FindMemberExpression(alias.Body)));
+ }
+
public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path)
{
return new QueryOver<U>(_impl,
@@ -96,6 +129,23 @@
ExpressionProcessor.FindMemberExpression(path.Body)));
}
+ public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, Expression<Func<U>> alias, JoinType joinType)
+ {
+ return new QueryOver<U>(_impl,
+ _criteria.CreateCriteria(
+ ExpressionProcessor.FindMemberExpression(path.Body),
+ ExpressionProcessor.FindMemberExpression(alias.Body),
+ joinType));
+ }
+
+ public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, JoinType joinType)
+ {
+ return new QueryOver<U>(_impl,
+ _criteria.CreateCriteria(
+ ExpressionProcessor.FindMemberExpression(path.Body),
+ joinType));
+ }
+
public QueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias)
{
return AddAlias(
@@ -204,9 +254,27 @@
IQueryOver<U> IQueryOver<T>.JoinQueryOver<U>(Expression<Func<T, U>> path)
{ return JoinQueryOver(path); }
+ IQueryOver<U> IQueryOver<T>.JoinQueryOver<U>(Expression<Func<T, U>> path, Expression<Func<U>> alias)
+ { return JoinQueryOver(path, alias); }
+
+ IQueryOver<U> IQueryOver<T>.JoinQueryOver<U>(Expression<Func<T, U>> path, JoinType joinType)
+ { return JoinQueryOver(path, joinType); }
+
+ IQueryOver<U> IQueryOver<T>.JoinQueryOver<U>(Expression<Func<T, U>> path, Expression<Func<U>> alias, JoinType joinType)
+ { return JoinQueryOver(path, alias, joinType); }
+
IQueryOver<U> IQueryOver<T>.JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path)
{ return JoinQueryOver(path); }
+ IQueryOver<U> IQueryOver<T>.JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, Expression<Func<U>> alias)
+ { return JoinQueryOver(path, alias); }
+
+ IQueryOver<U> IQueryOver<T>.JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, JoinType joinType)
+ { return JoinQueryOver(path, joinType); }
+
+ IQueryOver<U> IQueryOver<T>.JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, Expression<Func<U>> alias, JoinType joinType)
+ { return JoinQueryOver(path, alias, joinType); }
+
IQueryOver<T> IQueryOver<T>.Join(Expression<Func<T, object>> path, Expression<Func<object>> alias)
{ return Join(path, alias); }
Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOverJoinBuilder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOverJoinBuilder.cs 2009-07-08 15:34:48 UTC (rev 4591)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOverJoinBuilder.cs 2009-07-08 17:07:02 UTC (rev 4592)
@@ -12,28 +12,70 @@
public class QueryOverJoinBuilder<T> : QueryOverJoinBuilderBase<QueryOver<T>, T>
{
public QueryOverJoinBuilder(QueryOver<T> root, JoinType joinType) : base(root, joinType) { }
+
+ public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path)
+ {
+ return root.JoinQueryOver<U>(path, joinType);
+ }
+
+ public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path, Expression<Func<U>> alias)
+ {
+ return root.JoinQueryOver<U>(path, alias, joinType);
+ }
+
+ public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path)
+ {
+ return root.JoinQueryOver<U>(path, joinType);
+ }
+
+ public QueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, Expression<Func<U>> alias)
+ {
+ return root.JoinQueryOver<U>(path, alias, joinType);
+ }
+
}
public class IQueryOverJoinBuilder<T> : QueryOverJoinBuilderBase<IQueryOver<T>, T>
{
public IQueryOverJoinBuilder(IQueryOver<T> root, JoinType joinType) : base(root, joinType) { }
+
+ public IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path)
+ {
+ return root.JoinQueryOver<U>(path, joinType);
+ }
+
+ public IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path, Expression<Func<U>> alias)
+ {
+ return root.JoinQueryOver<U>(path, alias, joinType);
+ }
+
+ public IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path)
+ {
+ return root.JoinQueryOver<U>(path, joinType);
+ }
+
+ public IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, Expression<Func<U>> alias)
+ {
+ return root.JoinQueryOver<U>(path, alias, joinType);
+ }
+
}
public class QueryOverJoinBuilderBase<R, T> where R : IQueryOver<T>
{
- private R _root;
- private JoinType _joinType;
+ protected R root;
+ protected JoinType joinType;
public QueryOverJoinBuilderBase(R root, JoinType joinType)
{
- _root = root;
- _joinType = joinType;
+ this.root = root;
+ this.joinType = joinType;
}
public R Join(Expression<Func<T, object>> path, Expression<Func<object>> alias)
{
- return (R)_root.Join(path, alias, _joinType);
+ return (R)root.Join(path, alias, joinType);
}
}
Modified: trunk/nhibernate/src/NHibernate/IQueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-08 15:34:48 UTC (rev 4591)
+++ trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-08 17:07:02 UTC (rev 4592)
@@ -98,6 +98,32 @@
/// <summary>
/// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
+ /// </summary>
+ /// <typeparam name="U">Type of sub-criteria</typeparam>
+ /// <param name="path">Lambda expression returning association path</param>
+ /// <param name="alias">Lambda expression returning alias reference</param>
+ /// <returns>The created "sub criteria"</returns>
+ IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path, Expression<Func<U>> alias);
+
+ /// <summary>
+ /// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
+ /// </summary>
+ /// <typeparam name="U">Type of sub-criteria</typeparam>
+ /// <param name="path">Lambda expression returning association path</param>
+ /// <returns>The created "sub criteria"</returns>
+ IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path, JoinType joinType);
+
+ /// <summary>
+ /// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
+ /// </summary>
+ /// <typeparam name="U">Type of sub-criteria</typeparam>
+ /// <param name="path">Lambda expression returning association path</param>
+ /// <param name="alias">Lambda expression returning alias reference</param>
+ /// <returns>The created "sub criteria"</returns>
+ IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, U>> path, Expression<Func<U>> alias, JoinType joinType);
+
+ /// <summary>
+ /// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
/// specifying a collection for the join.
/// </summary>
/// <typeparam name="U">Type of sub-criteria (type of the collection)</typeparam>
@@ -106,6 +132,35 @@
IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path);
/// <summary>
+ /// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
+ /// specifying a collection for the join.
+ /// </summary>
+ /// <typeparam name="U">Type of sub-criteria (type of the collection)</typeparam>
+ /// <param name="path">Lambda expression returning association path</param>
+ /// <param name="alias">Lambda expression returning alias reference</param>
+ /// <returns>The created "sub criteria"</returns>
+ IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, Expression<Func<U>> alias);
+
+ /// <summary>
+ /// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
+ /// specifying a collection for the join.
+ /// </summary>
+ /// <typeparam name="U">Type of sub-criteria (type of the collection)</typeparam>
+ /// <param name="path">Lambda expression returning association path</param>
+ /// <returns>The created "sub criteria"</returns>
+ IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, JoinType joinType);
+
+ /// <summary>
+ /// Creates a new NHibernate.ICriteria<T>, "rooted" at the associated entity
+ /// specifying a collection for the join.
+ /// </summary>
+ /// <typeparam name="U">Type of sub-criteria (type of the collection)</typeparam>
+ /// <param name="path">Lambda expression returning association path</param>
+ /// <param name="alias">Lambda expression returning alias reference</param>
+ /// <returns>The created "sub criteria"</returns>
+ IQueryOver<U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, Expression<Func<U>> alias, JoinType joinType);
+
+ /// <summary>
/// Join an association, assigning an alias to the joined entity
/// </summary>
/// <param name="path">Lambda expression returning association path</param>
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs 2009-07-08 15:34:48 UTC (rev 4591)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs 2009-07-08 17:07:02 UTC (rev 4592)
@@ -94,7 +94,7 @@
PushName(name);
string fieldPath = _fieldPath.Peek();
- if (expected == null)
+ if (expected == null || actual == null)
{
Assert.AreEqual(expected, actual, fieldPath);
_fieldPath.Pop();
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/Model.cs 2009-07-08 15:34:48 UTC (rev 4591)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/Model.cs 2009-07-08 17:07:02 UTC (rev 4592)
@@ -36,6 +36,8 @@
public virtual IEnumerable<Relation> Collection3 { get; set; }
public virtual IEnumerable<Relation> Collection4 { get; set; }
+ public virtual IEnumerable<Person> People { get; set; }
+
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-08 15:34:48 UTC (rev 4591)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-08 17:07:02 UTC (rev 4592)
@@ -154,13 +154,43 @@
IQueryOver<Child> actual =
CreateTestQueryOver<Person>()
- .JoinQueryOver<Child>(p => p.Children) // sub-criteria
+ .JoinQueryOver(p => p.Children) // sub-criteria
.Where(c => c.Nickname == "test name");
AssertCriteriaAreEqual(expected, actual);
}
[Test]
+ public void SubCriteria_JoinQueryOverCombinations()
+ {
+ ICriteria expected =
+ CreateTestCriteria(typeof(Relation))
+ .CreateCriteria("Related1")
+ .CreateCriteria("Related2", JoinType.LeftOuterJoin)
+ .CreateCriteria("Related3", JoinType.RightOuterJoin)
+ .CreateCriteria("Related4", JoinType.FullJoin)
+ .CreateCriteria("Collection1", "collection1Alias")
+ .CreateCriteria("Collection2", "collection2Alias", JoinType.LeftOuterJoin)
+ .CreateCriteria("Collection3", JoinType.RightOuterJoin)
+ .CreateCriteria("People", "personAlias", JoinType.FullJoin);
+
+ Relation collection1Alias = null, collection2Alias = null;
+ Person personAlias = null;
+ IQueryOver<Person> actual =
+ CreateTestQueryOver<Relation>()
+ .Inner.JoinQueryOver(r => r.Related1)
+ .Left.JoinQueryOver(r => r.Related2)
+ .Right.JoinQueryOver(r => r.Related3)
+ .Full.JoinQueryOver(r => r.Related4)
+ .JoinQueryOver(r => r.Collection1, () => collection1Alias)
+ .Left.JoinQueryOver(r => r.Collection2, () => collection2Alias)
+ .Right.JoinQueryOver(r => r.Collection3)
+ .Full.JoinQueryOver(r => r.People, () => personAlias);
+
+ AssertCriteriaAreEqual(expected, actual);
+ }
+
+ [Test]
public void Alias_Join()
{
ICriteria expected =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ric...@us...> - 2009-07-08 15:34:58
|
Revision: 4591
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4591&view=rev
Author: ricbrown
Date: 2009-07-08 15:34:48 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Added QueryOver syntax for join-types.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
trunk/nhibernate/src/NHibernate/IQueryOver.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/Model.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-08 09:44:23 UTC (rev 4590)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-08 15:34:48 UTC (rev 4591)
@@ -117,6 +117,21 @@
get { return new QueryOverJoinBuilder<T>(this, JoinType.InnerJoin); }
}
+ public QueryOverJoinBuilder<T> Left
+ {
+ get { return new QueryOverJoinBuilder<T>(this, JoinType.LeftOuterJoin); }
+ }
+
+ public QueryOverJoinBuilder<T> Right
+ {
+ get { return new QueryOverJoinBuilder<T>(this, JoinType.RightOuterJoin); }
+ }
+
+ public QueryOverJoinBuilder<T> Full
+ {
+ get { return new QueryOverJoinBuilder<T>(this, JoinType.FullJoin); }
+ }
+
public IList<T> List()
{
return _criteria.List<T>();
@@ -198,9 +213,18 @@
IQueryOver<T> IQueryOver<T>.Join(Expression<Func<T, object>> path, Expression<Func<object>> alias, JoinType joinType)
{ return Join(path, alias, joinType); }
+ IQueryOverJoinBuilder<T> IQueryOver<T>.Inner
+ { get { return new IQueryOverJoinBuilder<T>(this, JoinType.InnerJoin); } }
+
IQueryOverJoinBuilder<T> IQueryOver<T>.Left
{ get { return new IQueryOverJoinBuilder<T>(this, JoinType.LeftOuterJoin); } }
+ IQueryOverJoinBuilder<T> IQueryOver<T>.Right
+ { get { return new IQueryOverJoinBuilder<T>(this, JoinType.RightOuterJoin); } }
+
+ IQueryOverJoinBuilder<T> IQueryOver<T>.Full
+ { get { return new IQueryOverJoinBuilder<T>(this, JoinType.FullJoin); } }
+
}
}
Modified: trunk/nhibernate/src/NHibernate/IQueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-08 09:44:23 UTC (rev 4590)
+++ trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-08 15:34:48 UTC (rev 4591)
@@ -121,7 +121,10 @@
/// <returns>criteria instance</returns>
IQueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias, JoinType joinType);
- IQueryOverJoinBuilder<T> Left { get; }
+ IQueryOverJoinBuilder<T> Inner { get; }
+ IQueryOverJoinBuilder<T> Left { get; }
+ IQueryOverJoinBuilder<T> Right { get; }
+ IQueryOverJoinBuilder<T> Full { get; }
/// <summary>
/// Get the results of the root type and fill the <see cref="IList<T>"/>
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/Model.cs 2009-07-08 09:44:23 UTC (rev 4590)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/Model.cs 2009-07-08 15:34:48 UTC (rev 4591)
@@ -23,5 +23,20 @@
public virtual string Nickname { get; set; }
}
+ public class Relation
+ {
+
+ public virtual Relation Related1 { get; set; }
+ public virtual Relation Related2 { get; set; }
+ public virtual Relation Related3 { get; set; }
+ public virtual Relation Related4 { get; set; }
+
+ public virtual IEnumerable<Relation> Collection1 { get; set; }
+ public virtual IEnumerable<Relation> Collection2 { get; set; }
+ public virtual IEnumerable<Relation> Collection3 { get; set; }
+ public virtual IEnumerable<Relation> Collection4 { get; set; }
+
+ }
+
}
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-08 09:44:23 UTC (rev 4590)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-08 15:34:48 UTC (rev 4591)
@@ -179,19 +179,31 @@
}
[Test]
- public void Alias_LeftJoin()
+ public void Alias_JoinCombinations()
{
ICriteria expected =
- CreateTestCriteria(typeof(Person))
- .CreateAlias("Father", "fatherAlias", JoinType.LeftOuterJoin)
- .CreateAlias("Children", "childAlias", JoinType.LeftOuterJoin);
+ CreateTestCriteria(typeof(Relation))
+ .CreateAlias("Related1", "related1Alias")
+ .CreateAlias("Collection1", "collection1Alias")
+ .CreateAlias("Related2", "related2Alias", JoinType.LeftOuterJoin)
+ .CreateAlias("Collection2", "collection2Alias", JoinType.LeftOuterJoin)
+ .CreateAlias("Related3", "related3Alias", JoinType.RightOuterJoin)
+ .CreateAlias("Collection3", "collection3Alias", JoinType.RightOuterJoin)
+ .CreateAlias("Related4", "related4Alias", JoinType.FullJoin)
+ .CreateAlias("Collection4", "collection4Alias", JoinType.FullJoin);
- Person fatherAlias = null;
- Child childAlias = null;
- IQueryOver<Person> actual =
- CreateTestQueryOver<Person>()
- .Left.Join(p => p.Father, () => fatherAlias)
- .Left.Join(p => p.Children, () => childAlias);
+ Relation related1Alias = null, related2Alias = null, related3Alias = null, related4Alias = null;
+ Relation collection1Alias = null, collection2Alias = null, collection3Alias = null, collection4Alias = null;
+ IQueryOver<Relation> actual =
+ CreateTestQueryOver<Relation>()
+ .Inner.Join(r => r.Related1, () => related1Alias)
+ .Inner.Join(r => r.Collection1, () => collection1Alias)
+ .Left.Join(r => r.Related2, () => related2Alias)
+ .Left.Join(r => r.Collection2, () => collection2Alias)
+ .Right.Join(r => r.Related3, () => related3Alias)
+ .Right.Join(r => r.Collection3, () => collection3Alias)
+ .Full.Join(r => r.Related4, () => related4Alias)
+ .Full.Join(r => r.Collection4, () => collection4Alias);
AssertCriteriaAreEqual(expected, actual);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ric...@us...> - 2009-07-08 09:44:29
|
Revision: 4590
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4590&view=rev
Author: ricbrown
Date: 2009-07-08 09:44:23 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Added place-holder for QueryOver join syntax.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
trunk/nhibernate/src/NHibernate/IQueryOver.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Criterion/QueryOverJoinBuilder.cs
Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-06 08:48:13 UTC (rev 4589)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-07-08 09:44:23 UTC (rev 4590)
@@ -104,6 +104,19 @@
JoinType.InnerJoin);
}
+ public QueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias, JoinType joinType)
+ {
+ return AddAlias(
+ ExpressionProcessor.FindMemberExpression(path.Body),
+ ExpressionProcessor.FindMemberExpression(alias.Body),
+ joinType);
+ }
+
+ public QueryOverJoinBuilder<T> Inner
+ {
+ get { return new QueryOverJoinBuilder<T>(this, JoinType.InnerJoin); }
+ }
+
public IList<T> List()
{
return _criteria.List<T>();
@@ -182,6 +195,12 @@
IQueryOver<T> IQueryOver<T>.Join(Expression<Func<T, object>> path, Expression<Func<object>> alias)
{ return Join(path, alias); }
+ IQueryOver<T> IQueryOver<T>.Join(Expression<Func<T, object>> path, Expression<Func<object>> alias, JoinType joinType)
+ { return Join(path, alias, joinType); }
+
+ IQueryOverJoinBuilder<T> IQueryOver<T>.Left
+ { get { return new IQueryOverJoinBuilder<T>(this, JoinType.LeftOuterJoin); } }
+
}
}
Added: trunk/nhibernate/src/NHibernate/Criterion/QueryOverJoinBuilder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOverJoinBuilder.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOverJoinBuilder.cs 2009-07-08 09:44:23 UTC (rev 4590)
@@ -0,0 +1,41 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+using NHibernate.Impl;
+using NHibernate.SqlCommand;
+
+namespace NHibernate.Criterion
+{
+
+ public class QueryOverJoinBuilder<T> : QueryOverJoinBuilderBase<QueryOver<T>, T>
+ {
+ public QueryOverJoinBuilder(QueryOver<T> root, JoinType joinType) : base(root, joinType) { }
+ }
+
+ public class IQueryOverJoinBuilder<T> : QueryOverJoinBuilderBase<IQueryOver<T>, T>
+ {
+ public IQueryOverJoinBuilder(IQueryOver<T> root, JoinType joinType) : base(root, joinType) { }
+ }
+
+ public class QueryOverJoinBuilderBase<R, T> where R : IQueryOver<T>
+ {
+
+ private R _root;
+ private JoinType _joinType;
+
+ public QueryOverJoinBuilderBase(R root, JoinType joinType)
+ {
+ _root = root;
+ _joinType = joinType;
+ }
+
+ public R Join(Expression<Func<T, object>> path, Expression<Func<object>> alias)
+ {
+ return (R)_root.Join(path, alias, _joinType);
+ }
+
+ }
+
+}
Modified: trunk/nhibernate/src/NHibernate/IQueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-06 08:48:13 UTC (rev 4589)
+++ trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-07-08 09:44:23 UTC (rev 4590)
@@ -4,6 +4,7 @@
using System.Linq.Expressions;
using NHibernate.Criterion;
+using NHibernate.SqlCommand;
namespace NHibernate
{
@@ -113,6 +114,16 @@
IQueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias);
/// <summary>
+ /// Join an association, assigning an alias to the joined entity
+ /// </summary>
+ /// <param name="path">Lambda expression returning association path</param>
+ /// <param name="alias">Lambda expression returning alias reference</param>
+ /// <returns>criteria instance</returns>
+ IQueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias, JoinType joinType);
+
+ IQueryOverJoinBuilder<T> Left { get; }
+
+ /// <summary>
/// Get the results of the root type and fill the <see cref="IList<T>"/>
/// </summary>
/// <returns>The list filled with the results.</returns>
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-07-06 08:48:13 UTC (rev 4589)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-07-08 09:44:23 UTC (rev 4590)
@@ -486,6 +486,7 @@
<Compile Include="Cfg\MappingSchema\HbmVersion.cs" />
<Compile Include="Cfg\MappingSchema\IDecoratable.cs" />
<Compile Include="Criterion\IPropertyProjection.cs" />
+ <Compile Include="Criterion\QueryOverJoinBuilder.cs" />
<Compile Include="Dialect\MsSql2008Dialect.cs" />
<Compile Include="Dialect\InformixDialect0940.cs" />
<Compile Include="Dialect\InformixDialect1000.cs" />
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-06 08:48:13 UTC (rev 4589)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-07-08 09:44:23 UTC (rev 4590)
@@ -4,6 +4,7 @@
using NUnit.Framework;
using NHibernate.Criterion;
+using NHibernate.SqlCommand;
using NHibernate.Transform;
using NHibernate.Type;
using NHibernate.Util;
@@ -128,7 +129,7 @@
}
[Test]
- public void SubCriteria_JoinWalk_ToOne()
+ public void SubCriteria_JoinQueryOver_ToOne()
{
ICriteria expected =
CreateTestCriteria(typeof(Person))
@@ -144,7 +145,7 @@
}
[Test]
- public void SubCriteria_JoinWalk_ToMany()
+ public void SubCriteria_JoinQueryOver_ToMany()
{
ICriteria expected =
CreateTestCriteria(typeof(Person))
@@ -178,6 +179,24 @@
}
[Test]
+ public void Alias_LeftJoin()
+ {
+ ICriteria expected =
+ CreateTestCriteria(typeof(Person))
+ .CreateAlias("Father", "fatherAlias", JoinType.LeftOuterJoin)
+ .CreateAlias("Children", "childAlias", JoinType.LeftOuterJoin);
+
+ Person fatherAlias = null;
+ Child childAlias = null;
+ IQueryOver<Person> actual =
+ CreateTestQueryOver<Person>()
+ .Left.Join(p => p.Father, () => fatherAlias)
+ .Left.Join(p => p.Children, () => childAlias);
+
+ AssertCriteriaAreEqual(expected, actual);
+ }
+
+ [Test]
public void OrderBy()
{
ICriteria expected =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Strenke Dejongh<pre...@kn...> - 2009-07-06 10:00:46
|
What Men Thinnk About Durbing sex www. via86. com. Mexican student finds new hsark speceis |
|
From: <te...@us...> - 2009-07-06 08:48:16
|
Revision: 4589
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4589&view=rev
Author: tehlike
Date: 2009-07-06 08:48:13 +0000 (Mon, 06 Jul 2009)
Log Message:
-----------
Adding ndoc to tools folder, and modifying build files accordingly.
Modified Paths:
--------------
trunk/nhibernate/build-common/common.xml
trunk/nhibernate/doc/documentation.build
Added Paths:
-----------
trunk/nhibernate/Tools/NDoc/
trunk/nhibernate/Tools/NDoc/Configuration/
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Accessibility.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/CustomMarshalers.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/ISymWrapper.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/MSBuild.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Engine.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Framework.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Tasks.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Utilities.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.JScript.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.VisualBasic.Vsa.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.VisualBasic.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.VisualC.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Configuration.Install.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Configuration.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Data.OracleClient.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Data.SqlXml.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Data.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Deployment.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Design.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.DirectoryServices.Protocols.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.DirectoryServices.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Drawing.Design.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Drawing.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.EnterpriseServices.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Management.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Messaging.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Runtime.Remoting.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Runtime.Serialization.Formatters.Soap.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Security.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.ServiceProcess.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Transactions.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Web.Mobile.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Web.RegularExpressions.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Web.Services.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Web.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Windows.Forms.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Xml.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/mscorlib.xml
trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/sysglobl.xml
trunk/nhibernate/Tools/NDoc/Interop.MSHelpCompiler.dll
trunk/nhibernate/Tools/NDoc/Interop.MSHelpServices.dll
trunk/nhibernate/Tools/NDoc/Mvp.Xml.dll
trunk/nhibernate/Tools/NDoc/NDoc.Core.UI.dll
trunk/nhibernate/Tools/NDoc/NDoc.Core.UI.pdb
trunk/nhibernate/Tools/NDoc/NDoc.Core.dll
trunk/nhibernate/Tools/NDoc/NDoc.Core.pdb
trunk/nhibernate/Tools/NDoc/NDoc.Documenter.Intellisense.dll
trunk/nhibernate/Tools/NDoc/NDoc.Documenter.Intellisense.pdb
trunk/nhibernate/Tools/NDoc/NDoc.Documenter.UnifiedMsdn.dll
trunk/nhibernate/Tools/NDoc/NDoc.Documenter.UnifiedMsdn.pdb
trunk/nhibernate/Tools/NDoc/NDoc.Documenter.Xml.dll
trunk/nhibernate/Tools/NDoc/NDoc.Documenter.Xml.pdb
trunk/nhibernate/Tools/NDoc/NDoc.ExtendedUI.dll
trunk/nhibernate/Tools/NDoc/NDoc.ExtendedUI.pdb
trunk/nhibernate/Tools/NDoc/NDoc2 Alpha3t ReadMe.htm
trunk/nhibernate/Tools/NDoc/NDocConsole.exe
trunk/nhibernate/Tools/NDoc/NDocConsole.pdb
trunk/nhibernate/Tools/NDoc/NDocGui.exe
trunk/nhibernate/Tools/NDoc/NDocGui.exe.manifest
trunk/nhibernate/Tools/NDoc/NDocGui.pdb
Property changes on: trunk/nhibernate/Tools/NDoc
___________________________________________________________________
Added: bugtraq:url
+ http://jira.nhibernate.org/browse/%BUGID%
Added: bugtraq:logregex
+ NH-\d+
Property changes on: trunk/nhibernate/Tools/NDoc/Configuration
___________________________________________________________________
Added: bugtraq:url
+ http://jira.nhibernate.org/browse/%BUGID%
Added: bugtraq:logregex
+ NH-\d+
Property changes on: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs
___________________________________________________________________
Added: bugtraq:url
+ http://jira.nhibernate.org/browse/%BUGID%
Added: bugtraq:logregex
+ NH-\d+
Property changes on: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN
___________________________________________________________________
Added: bugtraq:url
+ http://jira.nhibernate.org/browse/%BUGID%
Added: bugtraq:logregex
+ NH-\d+
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Accessibility.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Accessibility.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Accessibility.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>Accessibility</name>
+ </assembly>
+ <members />
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/CustomMarshalers.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/CustomMarshalers.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/CustomMarshalers.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>CustomMarshalers</name>
+ </assembly>
+ <members />
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/ISymWrapper.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/ISymWrapper.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/ISymWrapper.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>ISymWrapper</name>
+ </assembly>
+ <members>
+ <member name="Overload:System.Diagnostics.SymbolStore.SymBinder.GetReader">
+ <summary>Gets the interface of the symbol reader for the current file.</summary>
+ </member>
+ <member name="Overload:System.Diagnostics.SymbolStore.SymReader.GetMethod">
+ <summary>Gets a symbol reader method object.</summary>
+ </member>
+ </members>
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/MSBuild.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/MSBuild.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/MSBuild.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>MSBuild</name>
+ </assembly>
+ <members />
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Engine.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Engine.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Engine.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>Microsoft.Build.Engine</name>
+ </assembly>
+ <members>
+ <member name="Overload:Microsoft.Build.BuildEngine.BuildItemGroup.AddNewItem">
+ <summary>Adds a new <see cref="T:Microsoft.Build.BuildEngine.BuildItem" /> to the <see cref="T:Microsoft.Build.BuildEngine.BuildItemGroup" />.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.BuildItem.SetMetadata">
+ <summary>Assigns the specified value to the specified item metadata.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.BuildPropertyGroup.AddNewProperty">
+ <summary>Adds a new <see cref="T:Microsoft.Build.BuildEngine.BuildProperty" /> to the <see cref="T:Microsoft.Build.BuildEngine.BuildPropertyGroup" />.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.BuildPropertyGroup.RemoveProperty">
+ <summary>Removes the specified <see cref="T:Microsoft.Build.BuildEngine.BuildProperty" /> from the <see cref="T:Microsoft.Build.BuildEngine.BuildPropertyGroup" />.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.BuildPropertyGroup.SetProperty">
+ <summary>Sets the <see cref="P:Microsoft.Build.BuildEngine.BuildProperty.Value" /> of the <see cref="T:Microsoft.Build.BuildEngine.BuildProperty" /> with the specified <see cref="P:Microsoft.Build.BuildEngine.BuildProperty.Name" />.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.BuildTask.SetParameterValue">
+ <summary>Sets the value of the specified task parameter.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.Engine.BuildProject">
+ <summary>Builds the specified project.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.Engine.BuildProjectFile">
+ <summary>Loads the specified project file and builds the project.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.ImportCollection.CopyTo">
+ <summary>Copies the entire <see cref="T:Microsoft.Build.BuildEngine.ImportCollection" /> to a compatible one-dimensional <see cref="T:System.Array" />, starting at the specified index of the target array.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.Project.AddNewItem">
+ <summary>Adds the specified <see cref="dcef5f91-0613-4bfc-8ee9-d7004bb6d3a9">Item</see> element to the project.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.Project.Build">
+ <summary>Builds the project.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.Project.Load">
+ <summary>Loads the contents of a project file into the <see cref="T:Microsoft.Build.BuildEngine.Project" /> object.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.Project.Save">
+ <summary>Saves the project to a file.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.Project.SetImportedProperty">
+ <summary>Sets the value of a property in an imported project.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.Project.SetProperty">
+ <summary>Sets the value of the specified property.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.BuildEngine.UsingTaskCollection.CopyTo">
+ <summary>Copies the entire <see cref="T:Microsoft.Build.BuildEngine.UsingTaskCollection" /> to a compatible one-dimensional <see cref="T:System.Array" />, starting at the specified index of the target array.</summary>
+ </member>
+ </members>
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Framework.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Framework.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Framework.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>Microsoft.Build.Framework</name>
+ </assembly>
+ <members />
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Tasks.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Tasks.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Tasks.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>Microsoft.Build.Tasks</name>
+ </assembly>
+ <members />
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Utilities.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Utilities.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.Build.Utilities.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>Microsoft.Build.Utilities</name>
+ </assembly>
+ <members>
+ <member name="Overload:Microsoft.Build.Utilities.CommandLineBuilder.AppendFileNameIfNotNull">
+ <summary>Appends the command line with file name represented by the parameter, inserting quotation marks if necessary.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.CommandLineBuilder.AppendFileNamesIfNotNull">
+ <summary>Appends the command line with a list of file names, inserting quotation marks if necessary.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.CommandLineBuilder.AppendSwitchIfNotNull">
+ <summary>Appends the command line with a switch.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.CommandLineBuilder.AppendSwitchUnquotedIfNotNull">
+ <summary>Appends the command line with a switch, without attempting to encapsulate the switch parameters with quotation marks.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.TaskLoggingHelper.LogCommandLine">
+ <summary>Logs the command line.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.TaskLoggingHelper.LogError">
+ <summary>Logs an error.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.TaskLoggingHelper.LogErrorFromException">
+ <summary>Logs an error using the message from the specified exception.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.TaskLoggingHelper.LogErrorFromResources">
+ <summary>Logs an error using the specified resource string.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.TaskLoggingHelper.LogErrorWithCodeFromResources">
+ <summary>Logs an error with an error code using the specified resource string.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.TaskLoggingHelper.LogMessage">
+ <summary>Logs a message with the specified string.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.TaskLoggingHelper.LogMessageFromResources">
+ <summary>Logs a message with the specified resource string.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.TaskLoggingHelper.LogMessagesFromFile">
+ <summary>Logs errors, warnings, and messages for each line of text in the given file.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.TaskLoggingHelper.LogWarning">
+ <summary>Logs a warning.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.TaskLoggingHelper.LogWarningFromException">
+ <summary>Logs a warning using the message from the specified exception.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.TaskLoggingHelper.LogWarningFromResources">
+ <summary>Logs a warning using the specified resource string.</summary>
+ </member>
+ <member name="Overload:Microsoft.Build.Utilities.TaskLoggingHelper.LogWarningWithCodeFromResources">
+ <summary>Logs a warning with a warning code using the specified resource string.</summary>
+ </member>
+ </members>
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.JScript.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.JScript.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.JScript.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>Microsoft.JScript</name>
+ </assembly>
+ <members>
+ <member name="Overload:Microsoft.JScript.COMFieldInfo.SetValue">
+ <summary>Sets the value of the field supported by the given object.</summary>
+ </member>
+ <member name="Overload:Microsoft.JScript.COMMethodInfo.Invoke">
+ <summary>Invokes the method or constructor represented by the current instance, using the specified parameters.</summary>
+ </member>
+ <member name="Overload:Microsoft.JScript.COMPropertyInfo.GetAccessors">
+ <summary>Returns an array whose elements reflect the public <b>get</b>, <b>set</b>, and other accessors of the property reflected by the current instance.</summary>
+ </member>
+ <member name="Overload:Microsoft.JScript.COMPropertyInfo.GetGetMethod">
+ <summary>Returns the public <b>get</b> accessor for this property.</summary>
+ </member>
+ <member name="Overload:Microsoft.JScript.COMPropertyInfo.GetSetMethod">
+ <summary>Returns the public <b>set</b> accessor for this property.</summary>
+ </member>
+ <member name="Overload:Microsoft.JScript.COMPropertyInfo.GetValue">
+ <summary>Returns the value of the property with optional index values for indexed properties.</summary>
+ </member>
+ <member name="Overload:Microsoft.JScript.COMPropertyInfo.SetValue">
+ <summary>Sets the value of the property with optional index values for index properties.</summary>
+ </member>
+ <member name="Overload:Microsoft.JScript.Convert.ToString">
+ <summary>Returns a <see cref="T:System.String" /> that represents the current <see cref="T:System.Object" />.</summary>
+ </member>
+ <member name="Overload:Microsoft.JScript.JScriptCodeProvider.CreateGenerator">
+ <summary>Provides access to instances of the JScript code generator and code compiler.</summary>
+ </member>
+ <member name="Overload:Microsoft.JScript.JSMethodInfo.Invoke">
+ <summary>Invokes the method or constructor represented by the current instance, using the specified parameters.</summary>
+ </member>
+ <member name="Overload:Microsoft.JScript.JSMethod.Invoke">
+ <summary>Invokes the method or constructor represented by the current instance, using the specified parameters.</summary>
+ </member>
+ <member name="Overload:Microsoft.JScript.StringObject.Equals">
+ <summary>Determines whether the specified <see cref="T:System.Object" /> instances are considered equal.</summary>
+ </member>
+ <member name="Overload:Microsoft.JScript.TypedArray.Equals">
+ <summary>Determines whether the specified <see cref="T:System.Object" /> instances are considered equal.</summary>
+ </member>
+ </members>
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.VisualBasic.Vsa.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.VisualBasic.Vsa.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.VisualBasic.Vsa.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>Microsoft.VisualBasic.Vsa</name>
+ </assembly>
+ <members />
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.VisualBasic.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.VisualBasic.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.VisualBasic.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>Microsoft.VisualBasic</name>
+ </assembly>
+ <members>
+ <member name="Overload:Microsoft.VisualBasic.ApplicationServices.BuiltInRoleConverter.CanConvertTo">
+ <summary>Gets a value indicating whether this converter can convert an object to the given destination type using the context.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.ApplicationServices.BuiltInRoleConverter.ConvertTo">
+ <summary>Converts the given object to another type.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.ApplicationServices.User.IsInRole">
+ <summary>Determines whether the current user belongs to the specified role.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Collection.Item">
+ <summary>Returns a specific element of a <b>Collection</b> object either by position or by key. Read-only.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Collection.Remove">
+ <summary>Removes an element from a <b>Collection</b> object.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Conversion.ErrorToString">
+ <summary>Returns the error message that corresponds to a given error number.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Conversion.Fix">
+ <summary>Return the integer portion of a number.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Conversion.Hex">
+ <summary>Returns a string representing the hexadecimal value of a number.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Conversion.Int">
+ <summary>Return the integer portion of a number.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Conversion.Oct">
+ <summary>Returns a string representing the octal value of a number.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Conversion.Val">
+ <summary>Returns the numbers contained in a string as a numeric value of appropriate type.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.DateAndTime.DateAdd">
+ <summary>Returns a <b>Date</b> value containing a date and time value to which a specified time interval has been added.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.DateAndTime.DateDiff">
+ <summary>Returns a <b>Long</b> value specifying the number of time intervals between two <b>Date</b> values.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.DateAndTime.DatePart">
+ <summary>Returns an <b>Integer</b> value containing the specified component of a given <b>Date</b> value.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Devices.Audio.Play">
+ <summary>Plays a .wav sound file.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Devices.Keyboard.SendKeys">
+ <summary>Sends one or more keystrokes to the active window, as if typed on the keyboard.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Devices.Network.DownloadFile">
+ <summary>Downloads the specified remote file and saves it in the specified location.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Devices.Network.Ping">
+ <summary>Pings the specified server.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Devices.Network.UploadFile">
+ <summary>Sends the specified file to the specified host address.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Devices.Ports.OpenSerialPort">
+ <summary>Creates and opens a <see cref="T:System.IO.Ports.SerialPort" /> object.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.CopyDirectory">
+ <summary>Copies a directory to another directory.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.CopyFile">
+ <summary>Copies a file to a new location.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.DeleteDirectory">
+ <summary>Deletes a directory.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.DeleteFile">
+ <summary>Deletes a file.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.FindInFiles">
+ <summary>Returns a read-only collection of strings representing the names of files containing the specified text.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.GetDirectories">
+ <summary>Returns a collection of strings representing the path names of subdirectories within a directory.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.GetFiles">
+ <summary>Returns a read-only collection of strings representing the names of files within a directory.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.MoveDirectory">
+ <summary>Moves a directory from one location to another.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.MoveFile">
+ <summary>Moves a file to a new location.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.OpenTextFieldParser">
+ <summary>The <b>OpenTextFieldParser</b> method allows you to create a <see cref="d44bd2b0-7dfc-410b-a48b-534c1e97460b">TextFieldParser Object</see>, which provides a way to easily and efficiently parse structured text files, such as logs. The <b>TextFieldParser</b> object can be used to read both delimited and fixed-width files.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.OpenTextFileReader">
+ <summary>Opens a <see cref="T:System.IO.StreamReader" />.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.OpenTextFileWriter">
+ <summary>Opens a <see cref="T:System.IO.StreamWriter" />.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.ReadAllText">
+ <summary>Returns the contents of a text file as a <b>String</b>.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.FileSystem.WriteAllText">
+ <summary>Writes text to a file.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileIO.TextFieldParser.Dispose">
+ <summary>Releases resources used by the <see cref="T:Microsoft.VisualBasic.FileIO.TextFieldParser" /> object.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileSystem.ChDrive">
+ <summary>Changes the current drive.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileSystem.CurDir">
+ <summary>Returns a string representing the current path. The <see cref="4c145456-5453-4bda-aab5-578dc8bee59a">My.Computer.FileSystem Object</see> gives you greater productivity and performance in file I/O operations than <b>CurDir</b>. For more information, see <see cref="2ebefb41-a889-46a5-9406-8688329288c3">My.Computer.FileSystem.CurrentDirectory Property</see>.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileSystem.Dir">
+ <summary>Returns a string representing the name of a file, directory, or folder that matches a specified pattern or file attribute, or the volume label of a drive. The <see cref="4c145456-5453-4bda-aab5-578dc8bee59a">My.Computer.FileSystem Object</see> gives you greater productivity and performance in file I/O operations than the <b>Dir</b> function. See <see cref="24b3bb65-19d6-41b4-b5c5-532ac1fdb4f4">My.Computer.FileSystem.GetDirectoryInfo Method</see> for more information.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileSystem.FileGet">
+ <summary>Reads data from an open disk file into a variable. The <b>My</b> feature gives you greater productivity and performance in file I/O operations than <b>FileGet</b>. For more information, see <see cref="4c145456-5453-4bda-aab5-578dc8bee59a">My.Computer.FileSystem Object</see>.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileSystem.FilePut">
+ <summary>Writes data from a variable to a disk file. The <b>My</b> feature gives you greater productivity and performance in file I/O operations than <b>FilePut</b>. For more information, see <see cref="4c145456-5453-4bda-aab5-578dc8bee59a">My.Computer.FileSystem Object</see>.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileSystem.Input">
+ <summary>Reads data from an open sequential file and assigns the data to variables.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileSystem.Lock">
+ <summary>Controls access by other processes to all or part of a file opened using the <b>Open</b> function. The <b>My</b> feature gives you greater productivity and performance in file I/O operations than <b>Lock</b> and <b>Unlock</b>. For more information, see <see cref="4c145456-5453-4bda-aab5-578dc8bee59a">My.Computer.FileSystem Object</see>.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileSystem.Seek">
+ <summary>Returns a <b>Long</b> specifying the current read/write position within a file opened using the <b>FileOpen</b> function, or sets the position for the next read/write operation within a file opened using the <b>FileOpen</b> function. The <b>My</b> feature gives you greater productivity and performance in file I/O operations than <b>Seek</b>. For more information, see <see cref="4c145456-5453-4bda-aab5-578dc8bee59a">My.Computer.FileSystem Object</see>.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileSystem.TAB">
+ <summary>Used with the <b>Print</b> or <b>PrintLine</b> functions to position output.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.FileSystem.Unlock">
+ <summary>Controls access by other processes to all or part of a file opened using the <b>Open</b> function. The <b>My</b> feature gives you greater productivity and performance in file I/O operations than <b>Lock</b> and <b>Unlock</b>. For more information, see <see cref="4c145456-5453-4bda-aab5-578dc8bee59a">My.Computer.FileSystem Object</see>.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Interaction.AppActivate">
+ <summary>Activates an application that is already running.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Interaction.Environ">
+ <summary>Returns the string associated with an operating-system environment variable.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Logging.FileLogTraceListener.Dispose">
+ <summary>Closes the underlying stream and optionally releases the managed resources.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Logging.FileLogTraceListener.TraceData">
+ <summary>Writes trace data to the output file.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Logging.FileLogTraceListener.TraceEvent">
+ <summary>Writes trace and event information to the output file or stream.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Logging.FileLogTraceListener.Write">
+ <summary>Writes a message to disk verbatim, without any additional context information.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Logging.FileLogTraceListener.WriteLine">
+ <summary>Writes a verbatim message to disk, followed by the current line terminator, without any additional context information.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Logging.Log.WriteEntry">
+ <summary>Writes a message to the application's log listeners.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Logging.Log.WriteException">
+ <summary>Writes exception information to the application's log listeners.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.ClipboardProxy.ContainsText">
+ <summary>Determines if there is text on the Clipboard.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.ClipboardProxy.GetText">
+ <summary>Retrieves text from the Clipboard.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.ClipboardProxy.SetAudio">
+ <summary>Writes audio data to the Clipboard.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.ClipboardProxy.SetText">
+ <summary>Writes text to the Clipboard.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.CopyDirectory">
+ <summary>Copies a directory to another directory.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.CopyFile">
+ <summary>Copies a file to a new location.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.DeleteDirectory">
+ <summary>Deletes a directory.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.DeleteFile">
+ <summary>Deletes a file.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.FindInFiles">
+ <summary>Returns a read-only collection of strings representing the names of files containing the specified text.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.GetDirectories">
+ <summary>Returns a collection of strings representing the path names of subdirectories within a directory.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.GetFiles">
+ <summary>Returns a read-only collection of strings representing the names of files within a directory.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.MoveDirectory">
+ <summary>Moves a directory from one location to another.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.MoveFile">
+ <summary>Moves a file to a new location.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.OpenTextFieldParser">
+ <summary>The <b>OpenTextFieldParser</b> method allows you to create a <see cref="d44bd2b0-7dfc-410b-a48b-534c1e97460b">TextFieldParser Object</see>, which provides a way to easily and efficiently parse structured text files, such as logs. The <b>TextFieldParser</b> object can be used to read both delimited and fixed-width files.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.OpenTextFileReader">
+ <summary>Opens a <see cref="T:System.IO.StreamReader" />.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.OpenTextFileWriter">
+ <summary>Opens a <see cref="T:System.IO.StreamWriter" />.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.ReadAllText">
+ <summary>Returns the contents of a text file as a <b>String</b>.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.FileSystemProxy.WriteAllText">
+ <summary>Writes text to a file.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.MyServices.RegistryProxy.SetValue">
+ <summary>Writes a value to a registry key.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Strings.Asc">
+ <summary>Returns an <b>Integer</b> value representing the character code corresponding to a character.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Strings.AscW">
+ <summary>Returns an <b>Integer</b> value representing the character code corresponding to a character.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Strings.Filter">
+ <summary>Returns a zero-based array containing a subset of a <b>String</b> array based on specified filter criteria.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Strings.InStr">
+ <summary>Returns an integer specifying the start position of the first occurrence of one string within another.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Strings.Join">
+ <summary>Returns a string created by joining a number of substrings contained in an array.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Strings.LCase">
+ <summary>Returns a string or character converted to lowercase.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Strings.Len">
+ <summary>Returns an integer containing either the number of characters in a string or the nominal number of bytes required to store a variable.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Strings.Mid">
+ <summary>Returns a string containing a specified number of characters from a string.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Strings.StrDup">
+ <summary>Returns a string or object consisting of the specified character repeated the specified number of times.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.Strings.UCase">
+ <summary>Returns a string or character containing the specified string converted to uppercase.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.VBMath.Randomize">
+ <summary>Initializes the random-number generator.</summary>
+ </member>
+ <member name="Overload:Microsoft.VisualBasic.VBMath.Rnd">
+ <summary>Returns a random number of type <b>Single</b>.</summary>
+ </member>
+ </members>
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.VisualC.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.VisualC.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/Microsoft.VisualC.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>Microsoft.VisualC</name>
+ </assembly>
+ <members />
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Configuration.Install.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Configuration.Install.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Configuration.Install.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>System.Configuration.Install</name>
+ </assembly>
+ <members>
+ <member name="Overload:System.Configuration.Install.InstallerCollection.AddRange">
+ <summary>Adds the specified installers to this collection.</summary>
+ </member>
+ </members>
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Configuration.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Configuration.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Configuration.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>System.Configuration</name>
+ </assembly>
+ <members>
+ <member name="Overload:System.Configuration.CommaDelimitedStringCollectionConverter.ConvertFrom">
+ <summary>Converts a <see cref="T:System.String" /> object to a <see cref="T:System.Configuration.CommaDelimitedStringCollection" /> object.</summary>
+ </member>
+ <member name="Overload:System.Configuration.CommaDelimitedStringCollectionConverter.ConvertTo">
+ <summary>Converts a <see cref="T:System.Configuration.CommaDelimitedStringCollection" /> object to a <see cref="T:System.String" /> object.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationConverterBase.CanConvertFrom">
+ <summary>Determines whether the conversion is allowed.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationConverterBase.CanConvertTo">
+ <summary>Determines whether the conversion is allowed.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationElementCollection.BaseAdd">
+ <summary>Adds a <see cref="T:System.Configuration.ConfigurationElement" /> to an <see cref="T:System.Configuration.ConfigurationElementCollection" /> instance when overridden in a derived class.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationElementCollection.BaseGet">
+ <summary>Gets the <see cref="T:System.Configuration.ConfigurationElement" /> at the specified index location.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationElementCollection.CreateNewElement">
+ <summary>When overridden in a derived class, creates a new <see cref="T:System.Configuration.ConfigurationElement" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationElementCollection.Equals">
+ <summary>Compares the <see cref="T:System.Configuration.ConfigurationElementCollection" /> to the specified object.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationElement.Equals">
+ <summary>Compares the current <see cref="T:System.Configuration.ConfigurationElement" /> instance to the specified object.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationElement.Item">
+ <summary>Gets or sets a property, attribute, or child element of this <see cref="T:System.Configuration.ConfigurationElement" /> object.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationErrorsException.GetFilename">
+ <summary>Gets the path to the configuration file being read when this configuration exception was thrown.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationErrorsException.GetLineNumber">
+ <summary>Gets the line number within the configuration file that was being processed when this configuration exception was thrown.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationManager.OpenExeConfiguration">
+ <summary>Opens the specified client configuration file as a <see cref="T:System.Configuration.Configuration" /> object.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationSectionCollection.Get">
+ <summary>Gets a <see cref="T:System.Configuration.ConfigurationSection" /> object from this <see cref="T:System.Configuration.ConfigurationSectionCollection" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationSectionCollection.Item">
+ <summary>Gets the specified <see cref="T:System.Configuration.ConfigurationSection" /> object.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationSectionGroupCollection.Get">
+ <summary>Gets a <see cref="T:System.Configuration.ConfigurationSectionGroup" /> object from the collection</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationSectionGroupCollection.Item">
+ <summary>Gets or sets a <see cref="T:System.Configuration.ConfigurationSectionGroup" /> contained in this <see cref="T:System.Configuration.ConfigurationSectionGroupCollection" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConfigurationSectionGroup.ForceDeclaration">
+ <summary>Forces the declaration for this <see cref="T:System.Configuration.ConfigurationSectionGroup" /> object.</summary>
+ </member>
+ <member name="Overload:System.Configuration.Configuration.Save">
+ <summary>Writes the configuration settings contained within this <see cref="T:System.Configuration.Configuration" /> object to the current XML configuration file.</summary>
+ </member>
+ <member name="Overload:System.Configuration.Configuration.SaveAs">
+ <summary>Writes the configuration settings contained within this <see cref="T:System.Configuration.Configuration" /> object to the specified XML configuration file.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConnectionStringSettingsCollection.Item">
+ <summary>Gets or sets a <see cref="T:System.Configuration.ConnectionStringSettings" /> object in the collection.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ConnectionStringSettingsCollection.Remove">
+ <summary>Removes a <see cref="T:System.Configuration.ConnectionStringSettings" /> object from the collection.</summary>
+ </member>
+ <member name="Overload:System.Configuration.GenericEnumConverter.ConvertFrom">
+ <summary>Converts a <see cref="T:System.String" /> to an <see cref="T:System.Enum" /> type.</summary>
+ </member>
+ <member name="Overload:System.Configuration.GenericEnumConverter.ConvertTo">
+ <summary>Converts an <see cref="T:System.Enum" /> type to a <see cref="T:System.String" /> value.</summary>
+ </member>
+ <member name="Overload:System.Configuration.InfiniteIntConverter.ConvertFrom">
+ <summary>Converts a <see cref="T:System.String" /> to an <see cref="T:System.Int32" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.InfiniteIntConverter.ConvertTo">
+ <summary>Converts an <see cref="T:System.Int32" /> to a <see cref="T:System.String" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.InfiniteTimeSpanConverter.ConvertFrom">
+ <summary>Converts a <see cref="T:System.String" /> to a <see cref="T:System.TimeSpan" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.InfiniteTimeSpanConverter.ConvertTo">
+ <summary>Converts a <see cref="T:System.TimeSpan" /> to a <see cref="T:System.String" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.Internal.DelegatingConfigHost.OpenStreamForRead">
+ <summary>This member is for internal use only.</summary>
+ </member>
+ <member name="Overload:System.Configuration.Internal.DelegatingConfigHost.OpenStreamForWrite">
+ <summary>This member is for internal use only.</summary>
+ </member>
+ <member name="Overload:System.Configuration.Internal.DelegatingConfigHost.WriteCompleted">
+ <summary>This member is for internal use only.</summary>
+ </member>
+ <member name="Overload:System.Configuration.Internal.IInternalConfigHost.OpenStreamForRead">
+ <summary>This member is for internal use only.</summary>
+ </member>
+ <member name="Overload:System.Configuration.Internal.IInternalConfigHost.OpenStreamForWrite">
+ <summary>This member is for internal use only.</summary>
+ </member>
+ <member name="Overload:System.Configuration.Internal.IInternalConfigHost.WriteCompleted">
+ <summary>This member is for internal use only.</summary>
+ </member>
+ <member name="Overload:System.Configuration.KeyValueConfigurationCollection.Add">
+ <summary>Adds a <see cref="T:System.Configuration.KeyValueConfigurationElement" /> object to the collection.</summary>
+ </member>
+ <member name="Overload:System.Configuration.KeyValueConfigurationCollection.CreateNewElement">
+ <summary>When overridden in a derived class, the <see cref="Overload:System.Configuration.KeyValueConfigurationCollection.CreateNewElement" /> method creates a new <see cref="T:System.Configuration.KeyValueConfigurationElement" /> object.</summary>
+ </member>
+ <member name="Overload:System.Configuration.KeyValueConfigurationCollection.Item">
+ <summary>Gets or sets the <see cref="T:System.Configuration.KeyValueConfigurationElement" /> object.</summary>
+ </member>
+ <member name="Overload:System.Configuration.NameValueConfigurationCollection.Remove">
+ <summary>Removes a <see cref="T:System.Configuration.NameValueConfigurationElement" /> object from the collection.</summary>
+ </member>
+ <member name="Overload:System.Configuration.ProviderSettingsCollection.Item">
+ <summary>Indexer to an instance of the <see cref="T:System.Configuration.ProviderSettingsCollection" /> class.</summary>
+ </member>
+ <member name="Overload:System.Configuration.SectionInformation.ForceDeclaration">
+ <summary>Forces the associated configuration section to appear in the configuration file.</summary>
+ </member>
+ <member name="Overload:System.Configuration.TimeSpanMinutesConverter.ConvertFrom">
+ <summary>Converts a <see cref="T:System.String" /> to a <see cref="T:System.TimeSpan" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.TimeSpanMinutesConverter.ConvertTo">
+ <summary>Converts a <see cref="T:System.TimeSpan" /> to a <see cref="T:System.String" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.TimeSpanMinutesOrInfiniteConverter.ConvertFrom">
+ <summary>Converts a <see cref="T:System.String" /> to a <see cref="T:System.TimeSpan" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.TimeSpanMinutesOrInfiniteConverter.ConvertTo">
+ <summary>Converts a <see cref="T:System.TimeSpan" /> to a <see cref="T:System.String" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.TimeSpanSecondsConverter.ConvertFrom">
+ <summary>Converts a <see cref="T:System.String" /> to a <see cref="T:System.TimeSpan" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.TimeSpanSecondsConverter.ConvertTo">
+ <summary>Converts a <see cref="T:System.TimeSpan" /> to a <see cref="T:System.String" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.TimeSpanSecondsOrInfiniteConverter.ConvertFrom">
+ <summary>Converts a <see cref="T:System.String" /> to a <see cref="T:System.TimeSpan" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.TimeSpanSecondsOrInfiniteConverter.ConvertTo">
+ <summary>Converts a <see cref="T:System.TimeSpan" /> to a. <see cref="T:System.String" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.TypeNameConverter.ConvertFrom">
+ <summary>Converts a <see cref="T:System.String" /> to a <see cref="T:System.Type" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.TypeNameConverter.ConvertTo">
+ <summary>Converts a <see cref="T:System.Type" /> to a <see cref="T:System.String" />.</summary>
+ </member>
+ <member name="Overload:System.Configuration.WhiteSpaceTrimStringConverter.ConvertFrom">
+ <summary>Converts a <see cref="T:System.String" /> to canonical form.</summary>
+ </member>
+ <member name="Overload:System.Configuration.WhiteSpaceTrimStringConverter.ConvertTo">
+ <summary>Converts a <see cref="T:System.String" /> to canonical form.</summary>
+ </member>
+ </members>
+</doc>
\ No newline at end of file
Added: trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Data.OracleClient.xml
===================================================================
--- trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Data.OracleClient.xml (rev 0)
+++ trunk/nhibernate/Tools/NDoc/Configuration/Supplemental Docs/EN/System.Data.OracleClient.xml 2009-07-06 08:48:13 UTC (rev 4589)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+ <assembly>
+ <name>System.Data.OracleClient</name>
+ </assembly>
+ <members>
+ <member name="Overload:System.Data.OracleClient.OracleBFile.CopyTo">
+ <summary>Copies data from this <see cref="T:System.Data.OracleClient.OracleBFile" /> to a destination <see cref="T:System.Data.OracleClient.OracleLob" />.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleBinary.Equals">
+ <summary>Compares two <see cref="T:System.Data.OracleClient.OracleBinary" /> structures to determine if they are equal.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleBoolean.Equals">
+ <summary>Compares two <see cref="T:System.Data.OracleClient.OracleBoolean" /> structures to determine if they are equal.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleBoolean.op_Explicit">
+ <summary>Used for explicit <see cref="T:System.Data.OracleClient.OracleBoolean" /> conversion.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleCommandBuilder.GetDeleteCommand">
+ <summary>Gets the automatically generated <see cref="T:System.Data.OracleClient.OracleCommand" /> object required to perform deletions on the database.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleCommandBuilder.GetInsertCommand">
+ <summary>Gets the automatically generated <see cref="T:System.Data.OracleClient.OracleCommand" /> object required to perform insertions on the database.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleCommandBuilder.GetUpdateCommand">
+ <summary>Gets the automatically generated <see cref="T:System.Data.OracleClient.OracleCommand" /> object required to perform updates on the database.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleCommand.ExecuteReader">
+ <summary>Sends the <see cref="P:System.Data.OracleClient.OracleCommand.CommandText" /> to the <see cref="P:System.Data.OracleClient.OracleCommand.Connection" /> and builds an <see cref="T:System.Data.OracleClient.OracleDataReader" />.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleConnection.BeginTransaction">
+ <summary>Begins a transaction at the database.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleConnection.GetSchema">
+ <summary>Returns schema information for the data source of this <see cref="T:System.Data.OracleClient.OracleConnection" />.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleDataReader.Item">
+ <summary>Gets the value of a column in its native format.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleDateTime.Equals">
+ <summary>Compares the supplied object parameter to the <see cref="P:System.Data.OracleClient.OracleDateTime.Value" /> property of the <see cref="T:System.Data.OracleClient.OracleDateTime" /> object.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleDateTime.op_Explicit">
+ <summary>Used for explicit <see cref="T:System.Data.OracleClient.OracleDateTime" /> conversion.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleLob.BeginBatch">
+ <summary>Prevents server-side triggers from firing while performing multiple write operations.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleLob.CopyTo">
+ <summary>Copies from this <see cref="T:System.Data.OracleClient.OracleLob" /> to a destination <b>OracleLob</b>.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleLob.Erase">
+ <summary>Erases data from this <see cref="T:System.Data.OracleClient.OracleLob" />.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleMonthSpan.Equals">
+ <summary>Compares the supplied object parameter to the <see cref="P:System.Data.OracleClient.OracleMonthSpan.Value" /> property of the <see cref="T:System.Data.OracleClient.OracleMonthSpan" /> object.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleMonthSpan.op_Explicit">
+ <summary>Used for explicit <see cref="T:System.Data.OracleClient.OracleMonthSpan" /> conversion.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleNumber.Equals">
+ <summary>Compares the specified items to other items.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleNumber.Log">
+ <summary>Performs a logarithmic calculation on an <see cref="T:System.Data.OracleClient.OracleNumber" />.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleNumber.op_Explicit">
+ <summary>Used for explicit <see cref="T:System.Data.OracleClient.OracleNumber" /> conversion.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleNumber.Pow">
+ <summary>Calculates the result of raising a specified <see cref="T:System.Data.OracleClient.OracleNumber" /> structure to the specified power.</summary>
+ </member>
+ <member name="Overload:System.Data.OracleClient.OracleParameterCollection.Add">
+ <summary>Adds a <see cref="T:System.Data.OracleClient.OracleParameter" /> to the <see cref="T:System.Data.Ora...
[truncated message content] |
|
From: <fab...@us...> - 2009-07-05 22:42:33
|
Revision: 4588
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4588&view=rev
Author: fabiomaulo
Date: 2009-07-05 22:42:32 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Merge r4587 (fix NH-1867)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Util/StringHelper.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1867/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1867/AddMappingTest.cs
Modified: trunk/nhibernate/src/NHibernate/Util/StringHelper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Util/StringHelper.cs 2009-07-05 22:37:05 UTC (rev 4587)
+++ trunk/nhibernate/src/NHibernate/Util/StringHelper.cs 2009-07-05 22:42:32 UTC (rev 4588)
@@ -213,6 +213,14 @@
/// <returns></returns>
public static string Unqualify(string qualifiedName)
{
+ if(qualifiedName.IndexOf('`') > 0)
+ {
+ // less performance but correctly manage generics classes
+ // where the entity-name was not specified
+ // Note: the enitty-name is mandatory when the user want work with different type-args
+ // for the same generic-entity implementation
+ return GetClassname(qualifiedName);
+ }
return Unqualify(qualifiedName, ".");
}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1867/AddMappingTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1867/AddMappingTest.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1867/AddMappingTest.cs 2009-07-05 22:42:32 UTC (rev 4588)
@@ -0,0 +1,56 @@
+using NHibernate.Cfg;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1867
+{
+ [TestFixture]
+ public class AddMappingTest
+ {
+ private const string mappingTemplate =
+@"<?xml version='1.0' encoding='utf-8' ?>
+<hibernate-mapping xmlns='urn:nhibernate-mapping-2.2' auto-import='true'>
+ <class name='{0},NHibernate.Test'>
+ <id name='Id' column='Id' type='string'>
+ <generator class='assigned' />
+ </id>
+ </class>
+ <class name='{1},NHibernate.Test'>
+ <id name='OwnerId' column='Id' type='string'>
+ <generator class='assigned' />
+ </id>
+ </class>
+</hibernate-mapping>";
+
+ private class A
+ {
+ private string Id { get; set; }
+ public class B
+ {
+ private string OwnerId { get; set; }
+ }
+ }
+
+ private class A<T>
+ {
+ private string Id { get; set; }
+ public class B
+ {
+ private string OwnerId { get; set; }
+ }
+ }
+
+ [Test]
+ public void NestedWithinNonGeneric()
+ {
+ var configuration = new Configuration().Configure();
+ configuration.AddXml(string.Format(mappingTemplate, typeof(A).FullName, typeof(A.B).FullName));
+ }
+
+ [Test]
+ public void NestedWithinGeneric()
+ {
+ var configuration = new Configuration().Configure();
+ configuration.AddXml(string.Format(mappingTemplate, typeof(A<int>).FullName, typeof(A<int>.B).FullName));
+ }
+ }
+}
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-05 22:37:05 UTC (rev 4587)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-05 22:42:32 UTC (rev 4588)
@@ -539,6 +539,7 @@
<Compile Include="NHSpecificTest\NH1859\SampleTest.cs" />
<Compile Include="NHSpecificTest\NH1864\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1864\Model.cs" />
+ <Compile Include="NHSpecificTest\NH1867\AddMappingTest.cs" />
<Compile Include="NHSpecificTest\NH1868\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1868\Model.cs" />
<Compile Include="NHSpecificTest\NH473\Child.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-05 22:37:06
|
Revision: 4587
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4587&view=rev
Author: fabiomaulo
Date: 2009-07-05 22:37:05 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Forgotten file
Added Paths:
-----------
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1867/AddMappingTest.cs
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1867/AddMappingTest.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1867/AddMappingTest.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1867/AddMappingTest.cs 2009-07-05 22:37:05 UTC (rev 4587)
@@ -0,0 +1,56 @@
+using NHibernate.Cfg;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1867
+{
+ [TestFixture]
+ public class AddMappingTest
+ {
+ private const string mappingTemplate =
+@"<?xml version='1.0' encoding='utf-8' ?>
+<hibernate-mapping xmlns='urn:nhibernate-mapping-2.2' auto-import='true'>
+ <class name='{0},NHibernate.Test'>
+ <id name='Id' column='Id' type='string'>
+ <generator class='assigned' />
+ </id>
+ </class>
+ <class name='{1},NHibernate.Test'>
+ <id name='OwnerId' column='Id' type='string'>
+ <generator class='assigned' />
+ </id>
+ </class>
+</hibernate-mapping>";
+
+ private class A
+ {
+ private string Id { get; set; }
+ public class B
+ {
+ private string OwnerId { get; set; }
+ }
+ }
+
+ private class A<T>
+ {
+ private string Id { get; set; }
+ public class B
+ {
+ private string OwnerId { get; set; }
+ }
+ }
+
+ [Test]
+ public void NestedWithinNonGeneric()
+ {
+ var configuration = new Configuration().Configure();
+ configuration.AddXml(string.Format(mappingTemplate, typeof(A).FullName, typeof(A.B).FullName));
+ }
+
+ [Test]
+ public void NestedWithinGeneric()
+ {
+ var configuration = new Configuration().Configure();
+ configuration.AddXml(string.Format(mappingTemplate, typeof(A<int>).FullName, typeof(A<int>.B).FullName));
+ }
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-05 22:32:52
|
Revision: 4586
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4586&view=rev
Author: fabiomaulo
Date: 2009-07-05 22:32:50 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Fix NH-1867
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Util/StringHelper.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1867/
Modified: branches/2.1.x/nhibernate/src/NHibernate/Util/StringHelper.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Util/StringHelper.cs 2009-07-05 18:50:45 UTC (rev 4585)
+++ branches/2.1.x/nhibernate/src/NHibernate/Util/StringHelper.cs 2009-07-05 22:32:50 UTC (rev 4586)
@@ -213,6 +213,14 @@
/// <returns></returns>
public static string Unqualify(string qualifiedName)
{
+ if(qualifiedName.IndexOf('`') > 0)
+ {
+ // less performance but correctly manage generics classes
+ // where the entity-name was not specified
+ // Note: the enitty-name is mandatory when the user want work with different type-args
+ // for the same generic-entity implementation
+ return GetClassname(qualifiedName);
+ }
return Unqualify(qualifiedName, ".");
}
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-05 18:50:45 UTC (rev 4585)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-05 22:32:50 UTC (rev 4586)
@@ -532,6 +532,7 @@
<Compile Include="NHSpecificTest\NH1859\SampleTest.cs" />
<Compile Include="NHSpecificTest\NH1864\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1864\Model.cs" />
+ <Compile Include="NHSpecificTest\NH1867\AddMappingTest.cs" />
<Compile Include="NHSpecificTest\NH1868\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1868\Model.cs" />
<Compile Include="NHSpecificTest\NH473\Child.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-05 18:50:48
|
Revision: 4585
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4585&view=rev
Author: fabiomaulo
Date: 2009-07-05 18:50:45 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Merge r4584 (fix NH-1868)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Model.cs
Modified: trunk/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs 2009-07-05 18:48:06 UTC (rev 4584)
+++ trunk/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs 2009-07-05 18:50:45 UTC (rev 4585)
@@ -71,7 +71,7 @@
{
// NH Different behaviour NH-1776
// Analyze all named parameters declared after filters
- //in general all named parameters but depend on the complexity of the query
+ // in general all named parameters but depend on the complexity of the query (see sub query)
foreach (ParameterInfo entry in _namedParameters.Values)
{
int amountOfPush = 0;
@@ -79,7 +79,7 @@
{
// a parameter span, at least, one value; where span more than one all values are cosecutive
// the first position determines the position of the others values
- if (entry.SqlLocations[0] >= existingParameterLocation)
+ if (entry.SqlLocations[0]+amountOfPush >= existingParameterLocation)
{
amountOfPush++;
}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Fixture.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Fixture.cs 2009-07-05 18:50:45 UTC (rev 4585)
@@ -0,0 +1,103 @@
+using System;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1868
+{
+ [TestFixture]
+ public class Fixture : BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ base.OnSetUp();
+ using (ISession session = OpenSession())
+ {
+ using (ITransaction tx = session.BeginTransaction())
+ {
+ cat = new Category {ValidUntil = DateTime.Now};
+ session.Save(cat);
+
+ package = new Package {ValidUntil = DateTime.Now};
+ session.Save(package);
+
+ tx.Commit();
+ }
+ }
+ }
+
+ private Category cat;
+ private Package package;
+
+ protected override void OnTearDown()
+ {
+ using (ISession session = OpenSession())
+ {
+ using (ITransaction tx = session.BeginTransaction())
+ {
+ session.Delete("from Category");
+ session.Delete("from Package");
+ tx.Commit();
+ }
+ }
+ base.OnTearDown();
+ }
+
+ public void ExecuteQuery(Action<ISession> sessionModifier)
+ {
+ using (ISession session = OpenSession())
+ {
+ using (ITransaction tx = session.BeginTransaction())
+ {
+ sessionModifier(session);
+ session.Refresh(cat);
+ session.Refresh(package);
+
+ session.CreateQuery(
+ @"
+ select
+ inv
+ from
+ Invoice inv
+ , Package p
+ where
+ p = :package
+ and inv.Category = :cat
+ and inv.ValidUntil > :now
+ and inv.Package = :package
+ ")
+ .SetEntity("cat", cat).SetEntity("package", package).SetDateTime("now", DateTime.Now).UniqueResult<Invoice>();
+
+ tx.Commit();
+ }
+ }
+ }
+
+ [Test]
+ public void Bug()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+
+ [Test]
+ public void FilterOnOffOn()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => { }));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+
+ [Test]
+ public void FilterQueryTwice()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+
+ [Test]
+ public void FilterQuery3()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+ }
+}
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Mappings.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Mappings.hbm.xml 2009-07-05 18:50:45 UTC (rev 4585)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1868">
+
+ <class name="Category">
+ <id name="ID" type="Int32">
+ <generator class="hilo" />
+ </id>
+ <property name="ValidUntil" type="DateTime" />
+ <filter name="validity" condition="ValidUntil > :date" />
+ </class>
+
+ <class name="Package">
+ <id name="ID" type="Int32">
+ <generator class="hilo" />
+ </id>
+ <property name="ValidUntil" type="DateTime" />
+ <filter name="validity" condition="ValidUntil > :date" />
+ </class>
+
+ <class name="Invoice">
+ <id name="ID" type="Int32">
+ <generator class="hilo" />
+ </id>
+
+ <many-to-one name="Category" column="CategoryId" class="Category" />
+ <many-to-one name="Package" column="PacakgeId" class="Package" />
+ <property name="ValidUntil" type="DateTime" />
+ <filter name="validity" condition="ValidUntil > :date" />
+ </class>
+
+ <filter-def name="validity">
+ <filter-param name="date" type="DateTime"/>
+ </filter-def>
+
+</hibernate-mapping>
Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Model.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Model.cs 2009-07-05 18:50:45 UTC (rev 4585)
@@ -0,0 +1,24 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH1868
+{
+ public class Category
+ {
+ public virtual int ID { get; private set; }
+ public virtual DateTime ValidUntil { get; set; }
+ }
+
+ public class Package
+ {
+ public virtual int ID { get; private set; }
+ public virtual DateTime ValidUntil { get; set; }
+ }
+
+ public class Invoice
+ {
+ public virtual int ID { get; private set; }
+ public virtual DateTime ValidUntil { get; set; }
+ public virtual Category Category { get; set; }
+ public virtual Package Package { get; set; }
+ }
+}
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-05 18:48:06 UTC (rev 4584)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-05 18:50:45 UTC (rev 4585)
@@ -539,6 +539,8 @@
<Compile Include="NHSpecificTest\NH1859\SampleTest.cs" />
<Compile Include="NHSpecificTest\NH1864\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1864\Model.cs" />
+ <Compile Include="NHSpecificTest\NH1868\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1868\Model.cs" />
<Compile Include="NHSpecificTest\NH473\Child.cs" />
<Compile Include="NHSpecificTest\NH473\Fixture.cs" />
<Compile Include="NHSpecificTest\NH473\Parent.cs" />
@@ -1950,6 +1952,7 @@
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<EmbeddedResource Include="Criteria\Lambda\Mappings.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1868\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1857\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1859\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1864\Mappings.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-05 18:48:09
|
Revision: 4584
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4584&view=rev
Author: fabiomaulo
Date: 2009-07-05 18:48:06 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Fix NH-1868
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Fixture.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Mappings.hbm.xml
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Model.cs
Modified: branches/2.1.x/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs 2009-07-05 16:55:21 UTC (rev 4583)
+++ branches/2.1.x/nhibernate/src/NHibernate/Param/ParameterTranslationsImpl.cs 2009-07-05 18:48:06 UTC (rev 4584)
@@ -71,7 +71,7 @@
{
// NH Different behaviour NH-1776
// Analyze all named parameters declared after filters
- //in general all named parameters but depend on the complexity of the query
+ // in general all named parameters but depend on the complexity of the query (see sub query)
foreach (ParameterInfo entry in _namedParameters.Values)
{
int amountOfPush = 0;
@@ -79,7 +79,7 @@
{
// a parameter span, at least, one value; where span more than one all values are cosecutive
// the first position determines the position of the others values
- if (entry.SqlLocations[0] >= existingParameterLocation)
+ if (entry.SqlLocations[0]+amountOfPush >= existingParameterLocation)
{
amountOfPush++;
}
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Fixture.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Fixture.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Fixture.cs 2009-07-05 18:48:06 UTC (rev 4584)
@@ -0,0 +1,103 @@
+using System;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1868
+{
+ [TestFixture]
+ public class Fixture : BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ base.OnSetUp();
+ using (ISession session = OpenSession())
+ {
+ using (ITransaction tx = session.BeginTransaction())
+ {
+ cat = new Category {ValidUntil = DateTime.Now};
+ session.Save(cat);
+
+ package = new Package {ValidUntil = DateTime.Now};
+ session.Save(package);
+
+ tx.Commit();
+ }
+ }
+ }
+
+ private Category cat;
+ private Package package;
+
+ protected override void OnTearDown()
+ {
+ using (ISession session = OpenSession())
+ {
+ using (ITransaction tx = session.BeginTransaction())
+ {
+ session.Delete("from Category");
+ session.Delete("from Package");
+ tx.Commit();
+ }
+ }
+ base.OnTearDown();
+ }
+
+ public void ExecuteQuery(Action<ISession> sessionModifier)
+ {
+ using (ISession session = OpenSession())
+ {
+ using (ITransaction tx = session.BeginTransaction())
+ {
+ sessionModifier(session);
+ session.Refresh(cat);
+ session.Refresh(package);
+
+ session.CreateQuery(
+ @"
+ select
+ inv
+ from
+ Invoice inv
+ , Package p
+ where
+ p = :package
+ and inv.Category = :cat
+ and inv.ValidUntil > :now
+ and inv.Package = :package
+ ")
+ .SetEntity("cat", cat).SetEntity("package", package).SetDateTime("now", DateTime.Now).UniqueResult<Invoice>();
+
+ tx.Commit();
+ }
+ }
+ }
+
+ [Test]
+ public void Bug()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+
+ [Test]
+ public void FilterOnOffOn()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => { }));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+
+ [Test]
+ public void FilterQueryTwice()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+
+ [Test]
+ public void FilterQuery3()
+ {
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ Assert.DoesNotThrow(() => ExecuteQuery(s => s.EnableFilter("validity").SetParameter("date", DateTime.Now)));
+ }
+ }
+}
\ No newline at end of file
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Mappings.hbm.xml
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Mappings.hbm.xml (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Mappings.hbm.xml 2009-07-05 18:48:06 UTC (rev 4584)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+ assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1868">
+
+ <class name="Category">
+ <id name="ID" type="Int32">
+ <generator class="hilo" />
+ </id>
+ <property name="ValidUntil" type="DateTime" />
+ <filter name="validity" condition="ValidUntil > :date" />
+ </class>
+
+ <class name="Package">
+ <id name="ID" type="Int32">
+ <generator class="hilo" />
+ </id>
+ <property name="ValidUntil" type="DateTime" />
+ <filter name="validity" condition="ValidUntil > :date" />
+ </class>
+
+ <class name="Invoice">
+ <id name="ID" type="Int32">
+ <generator class="hilo" />
+ </id>
+
+ <many-to-one name="Category" column="CategoryId" class="Category" />
+ <many-to-one name="Package" column="PacakgeId" class="Package" />
+ <property name="ValidUntil" type="DateTime" />
+ <filter name="validity" condition="ValidUntil > :date" />
+ </class>
+
+ <filter-def name="validity">
+ <filter-param name="date" type="DateTime"/>
+ </filter-def>
+
+</hibernate-mapping>
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Model.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Model.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1868/Model.cs 2009-07-05 18:48:06 UTC (rev 4584)
@@ -0,0 +1,24 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH1868
+{
+ public class Category
+ {
+ public virtual int ID { get; private set; }
+ public virtual DateTime ValidUntil { get; set; }
+ }
+
+ public class Package
+ {
+ public virtual int ID { get; private set; }
+ public virtual DateTime ValidUntil { get; set; }
+ }
+
+ public class Invoice
+ {
+ public virtual int ID { get; private set; }
+ public virtual DateTime ValidUntil { get; set; }
+ public virtual Category Category { get; set; }
+ public virtual Package Package { get; set; }
+ }
+}
\ No newline at end of file
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-05 16:55:21 UTC (rev 4583)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-05 18:48:06 UTC (rev 4584)
@@ -532,6 +532,8 @@
<Compile Include="NHSpecificTest\NH1859\SampleTest.cs" />
<Compile Include="NHSpecificTest\NH1864\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1864\Model.cs" />
+ <Compile Include="NHSpecificTest\NH1868\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1868\Model.cs" />
<Compile Include="NHSpecificTest\NH473\Child.cs" />
<Compile Include="NHSpecificTest\NH473\Fixture.cs" />
<Compile Include="NHSpecificTest\NH473\Parent.cs" />
@@ -1942,6 +1944,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1868\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1849\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1857\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1859\Mappings.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-05 16:55:23
|
Revision: 4583
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4583&view=rev
Author: fabiomaulo
Date: 2009-07-05 16:55:21 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Merge r4582 (partial fix NH-1867)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Util/TypeNameParser.cs
trunk/nhibernate/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Util/TypeNameParser.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Util/TypeNameParser.cs 2009-07-05 16:52:07 UTC (rev 4582)
+++ trunk/nhibernate/src/NHibernate/Util/TypeNameParser.cs 2009-07-05 16:55:21 UTC (rev 4583)
@@ -65,7 +65,8 @@
{
throw new ParserException("Invalid generic fully-qualified type name:" + type);
}
- string cardinalityString = type.Substring(genericTypeCardinalityIdx + 1, genericTypeArgsStartIdx - genericTypeCardinalityIdx - 1);
+ // the follow will fail with a generic class with more the 9 type-args (I would see that entity class)
+ string cardinalityString = type.Substring(genericTypeCardinalityIdx + 1, 1);
int genericTypeCardinality = int.Parse(cardinalityString);
// get the FullName of the non-generic type
Modified: trunk/nhibernate/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs 2009-07-05 16:52:07 UTC (rev 4582)
+++ trunk/nhibernate/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs 2009-07-05 16:55:21 UTC (rev 4583)
@@ -265,5 +265,34 @@
var a = TypeNameParser.Parse(typeName);
Assert.That(a.ToString(), Is.EqualTo(expected));
}
+
+ private class A<T>
+ {
+ public class B { }
+ }
+
+ private class Aa<T>
+ {
+ public class Bb<TX, TJ, TZ>
+ {
+ public class C { }
+ }
+ }
+
+ [Test]
+ [Description("Parser multiple nested classes with a generic in the middle.")]
+ public void ParseNestedWithinGeneric()
+ {
+ // NH-1867
+ CheckInput(typeof(A<int>.B).FullName, typeof(A<int>.B).FullName, null);
+ }
+
+ [Test]
+ [Description("Parser multiple nested classes with a generics.")]
+ public void ComplexNestedWithGeneric()
+ {
+ CheckInput(typeof(Aa<int>.Bb<int, short, string>).FullName, typeof(Aa<int>.Bb<int, short, string>).FullName, null);
+ CheckInput(typeof(Aa<int>.Bb<int, short, string>.C).FullName, typeof(Aa<int>.Bb<int, short, string>.C).FullName, null);
+ }
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-05 16:52:07
|
Revision: 4582
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4582&view=rev
Author: fabiomaulo
Date: 2009-07-05 16:52:07 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Partially Fix NH-1867 (when the user send us a valid mapping, perhaps, we can fix the other part)
Modified Paths:
--------------
branches/2.1.x/nhibernate/src/NHibernate/Util/TypeNameParser.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs
Modified: branches/2.1.x/nhibernate/src/NHibernate/Util/TypeNameParser.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Util/TypeNameParser.cs 2009-07-05 04:45:50 UTC (rev 4581)
+++ branches/2.1.x/nhibernate/src/NHibernate/Util/TypeNameParser.cs 2009-07-05 16:52:07 UTC (rev 4582)
@@ -65,7 +65,8 @@
{
throw new ParserException("Invalid generic fully-qualified type name:" + type);
}
- string cardinalityString = type.Substring(genericTypeCardinalityIdx + 1, genericTypeArgsStartIdx - genericTypeCardinalityIdx - 1);
+ // the follow will fail with a generic class with more the 9 type-args (I would see that entity class)
+ string cardinalityString = type.Substring(genericTypeCardinalityIdx + 1, 1);
int genericTypeCardinality = int.Parse(cardinalityString);
// get the FullName of the non-generic type
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs 2009-07-05 04:45:50 UTC (rev 4581)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs 2009-07-05 16:52:07 UTC (rev 4582)
@@ -265,5 +265,34 @@
var a = TypeNameParser.Parse(typeName);
Assert.That(a.ToString(), Is.EqualTo(expected));
}
+
+ private class A<T>
+ {
+ public class B { }
+ }
+
+ private class Aa<T>
+ {
+ public class Bb<TX, TJ, TZ>
+ {
+ public class C { }
+ }
+ }
+
+ [Test]
+ [Description("Parser multiple nested classes with a generic in the middle.")]
+ public void ParseNestedWithinGeneric()
+ {
+ // NH-1867
+ CheckInput(typeof(A<int>.B).FullName, typeof(A<int>.B).FullName, null);
+ }
+
+ [Test]
+ [Description("Parser multiple nested classes with a generics.")]
+ public void ComplexNestedWithGeneric()
+ {
+ CheckInput(typeof(Aa<int>.Bb<int, short, string>).FullName, typeof(Aa<int>.Bb<int, short, string>).FullName, null);
+ CheckInput(typeof(Aa<int>.Bb<int, short, string>.C).FullName, typeof(Aa<int>.Bb<int, short, string>.C).FullName, null);
+ }
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-05 04:45:56
|
Revision: 4581
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4581&view=rev
Author: fabiomaulo
Date: 2009-07-05 04:45:50 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
changed next release
Modified Paths:
--------------
branches/2.1.x/nhibernate/build-common/common.xml
Modified: branches/2.1.x/nhibernate/build-common/common.xml
===================================================================
--- branches/2.1.x/nhibernate/build-common/common.xml 2009-07-05 04:25:40 UTC (rev 4580)
+++ branches/2.1.x/nhibernate/build-common/common.xml 2009-07-05 04:45:50 UTC (rev 4581)
@@ -76,7 +76,7 @@
effectively SP0).
-->
- <property name="project.version" value="2.1.0.CR1" overwrite="false" />
+ <property name="project.version" value="2.1.0.GA" overwrite="false" />
<!-- Compute short project version (major.minor) using a regex -->
<regex input="${project.version}" pattern="^(?'shortversion'\d+\.\d+)" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-05 04:25:40
|
Revision: 4580
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4580&view=rev
Author: fabiomaulo
Date: 2009-07-05 04:25:40 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Preparing release 2.1.0CR1
Modified Paths:
--------------
branches/2.1.x/nhibernate/releasenotes.txt
Modified: branches/2.1.x/nhibernate/releasenotes.txt
===================================================================
--- branches/2.1.x/nhibernate/releasenotes.txt 2009-07-05 04:17:11 UTC (rev 4579)
+++ branches/2.1.x/nhibernate/releasenotes.txt 2009-07-05 04:25:40 UTC (rev 4580)
@@ -33,6 +33,21 @@
* ADOException now use string instead SqlString
* IParameterizedType is using IDictionary<string, string>
+Build 2.1.0.CR1 (rev4578)
+=============================
+** Bug
+ * [NH-1849] - Using custom sql function "contains" causes an Antlr exception
+ * [NH-1857] - NH2.1: Full Join in HQL query does not work.
+ * [NH-1859] - SQL-Commands with more than one comment don't work
+ * [NH-1864] - SQL response parameter mishandling when using filter on two classes
+
+** Improvement
+ * [NH-1844] - SessionIdLoggingContext introduced in trunk revision 4265 is very time costly
+ * [NH-1850] - NHibernate should log query duration
+
+** New Feature
+ * [NH-1853] - Add a Configuration.AddNamespace method to allow adding mappings within a specific folder
+
Build 2.1.0.Beta2 (rev4501)
=============================
** Sub-task
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-07-05 04:17:17
|
Revision: 4579
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4579&view=rev
Author: fabiomaulo
Date: 2009-07-05 04:17:11 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Removed ignore because fixed in r4576
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs 2009-07-05 04:15:41 UTC (rev 4578)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH645/HQLFunctionFixture.cs 2009-07-05 04:17:11 UTC (rev 4579)
@@ -21,7 +21,7 @@
}
}
- [TestFixture, Ignore("Not fixed yet in the AST-HQL parser")]
+ [TestFixture]
public class HqlFunctionWithAstHqlParser : HQLFunctionFixtureBase
{
protected override void Configure(Configuration configuration)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1279 messages has been excluded from this view by a project administrator.
