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: Michael D. <mik...@us...> - 2004-11-22 03:56:45
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Mapping In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29295/Mapping Modified Files: IdentifierCollection.cs IndexedCollection.cs Log Message: minor fixes for FxCop rules Index: IdentifierCollection.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Mapping/IdentifierCollection.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IdentifierCollection.cs 14 Apr 2004 03:06:20 -0000 1.1 --- IdentifierCollection.cs 22 Nov 2004 03:56:00 -0000 1.2 *************** *** 12,16 **** private Value identifier; ! public IdentifierCollection(PersistentClass owner) : base(owner) { } --- 12,16 ---- private Value identifier; ! protected IdentifierCollection(PersistentClass owner) : base(owner) { } Index: IndexedCollection.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Mapping/IndexedCollection.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IndexedCollection.cs 13 Apr 2004 02:06:54 -0000 1.3 --- IndexedCollection.cs 22 Nov 2004 03:56:00 -0000 1.4 *************** *** 13,17 **** private Value index; ! public IndexedCollection(PersistentClass owner) : base(owner) { } --- 13,17 ---- private Value index; ! protected IndexedCollection(PersistentClass owner) : base(owner) { } |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:56:45
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Expression In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29295/Expression Modified Files: LogicalExpression.cs Log Message: minor fixes for FxCop rules Index: LogicalExpression.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Expression/LogicalExpression.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LogicalExpression.cs 28 Mar 2004 06:05:09 -0000 1.3 --- LogicalExpression.cs 22 Nov 2004 03:55:59 -0000 1.4 *************** *** 16,27 **** { - /// <summary> - /// The Expression that will be on the Left Hand Side of the Op. - /// </summary> protected Expression lhs; - - /// <summary> - /// The Expression that will be on the Right Hand Side of the Op. - /// </summary> protected Expression rhs; --- 16,20 ---- *************** *** 39,42 **** --- 32,51 ---- /// <summary> + /// The Expression that will be on the Left Hand Side of the Op. + /// </summary> + protected Expression LeftHandSide + { + get { return lhs; } + } + + /// <summary> + /// The Expression that will be on the Right Hand Side of the Op. + /// </summary> + protected Expression RightHandSide + { + get { return rhs; } + } + + /// <summary> /// Combines the <see cref="TypedValue"/> for the Left Hand Side and the /// Right Hand Side of the Expression into one array. |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:56:45
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Driver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29295/Driver Modified Files: DriverBase.cs Log Message: minor fixes for FxCop rules Index: DriverBase.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Driver/DriverBase.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DriverBase.cs 21 Sep 2004 09:58:24 -0000 1.8 --- DriverBase.cs 22 Nov 2004 03:55:58 -0000 1.9 *************** *** 13,19 **** public abstract class DriverBase : IDriver { - public DriverBase() - { - } #region IDriver Members --- 13,16 ---- |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:56:24
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29295/Type Modified Files: PersistentCollectionType.cs Log Message: minor fixes for FxCop rules Index: PersistentCollectionType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/PersistentCollectionType.cs,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** PersistentCollectionType.cs 22 Sep 2004 04:46:44 -0000 1.15 --- PersistentCollectionType.cs 22 Nov 2004 03:56:08 -0000 1.16 *************** *** 18,22 **** private static readonly SqlType[] NoSqlTypes = {}; ! public PersistentCollectionType(string role) { this.role = role; --- 18,22 ---- private static readonly SqlType[] NoSqlTypes = {}; ! protected PersistentCollectionType(string role) { this.role = role; |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:56:24
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29295/SqlCommand Modified Files: ISqlStringBuilder.cs QuerySelect.cs SqlBaseBuilder.cs SqlDeleteBuilder.cs SqlInsertBuilder.cs SqlSelectBuilder.cs SqlSimpleSelectBuilder.cs SqlString.cs SqlUpdateBuilder.cs Template.cs Log Message: minor fixes for FxCop rules Index: SqlString.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlString.cs,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** SqlString.cs 21 Sep 2004 09:58:25 -0000 1.15 --- SqlString.cs 22 Nov 2004 03:56:08 -0000 1.16 *************** *** 98,104 **** // don't add an empty string into the new compacted SqlString ! if(builderString!=String.Empty) { ! sqlBuilder.Add(builderString); } --- 98,104 ---- // don't add an empty string into the new compacted SqlString ! if( builderString.Length!=0 ) { ! sqlBuilder.Add( builderString ); } Index: QuerySelect.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/QuerySelect.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** QuerySelect.cs 21 Aug 2004 13:08:08 -0000 1.1 --- QuerySelect.cs 22 Nov 2004 03:56:08 -0000 1.2 *************** *** 99,102 **** --- 99,103 ---- public bool Distinct { + get { return distinct; } set { this.distinct = value; } } Index: SqlUpdateBuilder.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlUpdateBuilder.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SqlUpdateBuilder.cs 13 Sep 2004 07:22:38 -0000 1.3 --- SqlUpdateBuilder.cs 22 Nov 2004 03:56:08 -0000 1.4 *************** *** 94,100 **** public SqlUpdateBuilder AddColumns(string[] columnNames, IType propertyType) { ! Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, propertyType); ! for(int i = 0; i < columnNames.Length; i++) { this.columnNames.Add(columnNames[i]); columnValues.Add(parameters[i]); --- 94,101 ---- public SqlUpdateBuilder AddColumns(string[] columnNames, IType propertyType) { ! Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, propertyType ); ! for(int i = 0; i < columnNames.Length; i++) ! { this.columnNames.Add(columnNames[i]); columnValues.Add(parameters[i]); *************** *** 112,116 **** public SqlUpdateBuilder SetIdentityColumn(string[] columnNames, IType identityType) { ! Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, identityType); identityFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters)); --- 113,117 ---- public SqlUpdateBuilder SetIdentityColumn(string[] columnNames, IType identityType) { ! Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, identityType ); identityFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters)); *************** *** 127,131 **** public SqlUpdateBuilder SetVersionColumn(string[] columnNames, IVersionType versionType) { ! Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, versionType); versionFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters)); --- 128,132 ---- public SqlUpdateBuilder SetVersionColumn(string[] columnNames, IVersionType versionType) { ! Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, versionType ); versionFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters)); *************** *** 143,147 **** public SqlUpdateBuilder AddWhereFragment(string[] columnNames, IType type, string op) { ! Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, type); whereStrings.Add(ToWhereString(columnNames, parameters, op)); --- 144,148 ---- public SqlUpdateBuilder AddWhereFragment(string[] columnNames, IType type, string op) { ! Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, type ); whereStrings.Add(ToWhereString(columnNames, parameters, op)); Index: Template.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/Template.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Template.cs 21 Oct 2004 00:21:06 -0000 1.8 --- Template.cs 22 Nov 2004 03:56:08 -0000 1.9 *************** *** 15,21 **** public sealed class Template { ! private static StringDictionary Keywords = new StringDictionary(); - public static readonly string PlaceHolder = "$PlaceHolder"; private static ArrayList delimiterList = new ArrayList(13); private static string delimiters = null; --- 15,21 ---- public sealed class Template { ! public const string PlaceHolder = "$PlaceHolder"; ! private static StringDictionary Keywords = new StringDictionary(); private static ArrayList delimiterList = new ArrayList(13); private static string delimiters = null; Index: ISqlStringBuilder.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/ISqlStringBuilder.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ISqlStringBuilder.cs 10 Feb 2004 18:38:55 -0000 1.1 --- ISqlStringBuilder.cs 22 Nov 2004 03:56:00 -0000 1.2 *************** *** 4,10 **** using NHibernate.Connection; ! namespace NHibernate.SqlCommand { ! public interface ISqlStringBuilder { /// <summary> /// Builds a SqlString from the internal data. --- 4,12 ---- using NHibernate.Connection; ! namespace NHibernate.SqlCommand ! { ! public interface ISqlStringBuilder ! { /// <summary> /// Builds a SqlString from the internal data. Index: SqlSimpleSelectBuilder.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlSimpleSelectBuilder.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SqlSimpleSelectBuilder.cs 10 Feb 2004 18:38:55 -0000 1.1 --- SqlSimpleSelectBuilder.cs 22 Nov 2004 03:56:08 -0000 1.2 *************** *** 105,110 **** /// <param name="identityType">The IType of the Identity Property.</param> /// <returns>The SqlSimpleSelectBuilder.</returns> ! public SqlSimpleSelectBuilder SetIdentityColumn(string[] columnNames, IType identityType) { ! Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, identityType); identityFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters)); --- 105,111 ---- /// <param name="identityType">The IType of the Identity Property.</param> /// <returns>The SqlSimpleSelectBuilder.</returns> ! public SqlSimpleSelectBuilder SetIdentityColumn(string[] columnNames, IType identityType) ! { ! Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, identityType ); identityFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters)); *************** *** 119,124 **** /// <param name="versionType">The IVersionType of the Version Property.</param> /// <returns>The SqlSimpleSelectBuilder.</returns> ! public SqlSimpleSelectBuilder SetVersionColumn(string[] columnNames, IVersionType versionType) { ! Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, versionType); versionFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters)); --- 120,126 ---- /// <param name="versionType">The IVersionType of the Version Property.</param> /// <returns>The SqlSimpleSelectBuilder.</returns> ! public SqlSimpleSelectBuilder SetVersionColumn(string[] columnNames, IVersionType versionType) ! { ! Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, versionType ); versionFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters)); *************** *** 154,159 **** /// <param name="op">The operator to put between the column name and value.</param> /// <returns>The SqlSimpleSelectBuilder</returns> ! public SqlSimpleSelectBuilder AddWhereFragment(string[] columnNames, IType type, string op) { ! Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, type); whereStrings.Add(ToWhereString(columnNames, parameters, op)); --- 156,162 ---- /// <param name="op">The operator to put between the column name and value.</param> /// <returns>The SqlSimpleSelectBuilder</returns> ! public SqlSimpleSelectBuilder AddWhereFragment(string[] columnNames, IType type, string op) ! { ! Parameter[] parameters = Parameter.GenerateParameters(Factory, columnNames, type); whereStrings.Add(ToWhereString(columnNames, parameters, op)); Index: SqlDeleteBuilder.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlDeleteBuilder.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SqlDeleteBuilder.cs 13 Sep 2004 07:22:38 -0000 1.3 --- SqlDeleteBuilder.cs 22 Nov 2004 03:56:08 -0000 1.4 *************** *** 43,47 **** public SqlDeleteBuilder SetIdentityColumn(string[] columnNames, IType identityType) { ! Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, identityType); identityFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters)); --- 43,47 ---- public SqlDeleteBuilder SetIdentityColumn(string[] columnNames, IType identityType) { ! Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, identityType ); identityFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters)); *************** *** 58,62 **** public SqlDeleteBuilder SetVersionColumn(string[] columnNames, IVersionType versionType) { ! Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, versionType); versionFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters)); --- 58,62 ---- public SqlDeleteBuilder SetVersionColumn(string[] columnNames, IVersionType versionType) { ! Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, versionType ); versionFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters)); *************** *** 74,78 **** public SqlDeleteBuilder AddWhereFragment(string[] columnNames, IType type, string op) { ! Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, type); whereStrings.Add(ToWhereString(columnNames, parameters, op)); --- 74,78 ---- public SqlDeleteBuilder AddWhereFragment(string[] columnNames, IType type, string op) { ! Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, type ); whereStrings.Add(ToWhereString(columnNames, parameters, op)); Index: SqlSelectBuilder.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlSelectBuilder.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SqlSelectBuilder.cs 13 Sep 2004 07:22:38 -0000 1.4 --- SqlSelectBuilder.cs 22 Nov 2004 03:56:08 -0000 1.5 *************** *** 144,148 **** public SqlSelectBuilder SetWhereClause(string tableAlias, string[] columnNames, IType whereType) { ! Parameter[] parameters = Parameter.GenerateParameters(factory, tableAlias, columnNames, whereType); whereSqlStrings.Add(ToWhereString(tableAlias, columnNames, parameters)); --- 144,148 ---- public SqlSelectBuilder SetWhereClause(string tableAlias, string[] columnNames, IType whereType) { ! Parameter[] parameters = Parameter.GenerateParameters( Factory, tableAlias, columnNames, whereType ); whereSqlStrings.Add(ToWhereString(tableAlias, columnNames, parameters)); Index: SqlBaseBuilder.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlBaseBuilder.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SqlBaseBuilder.cs 21 Sep 2004 09:58:25 -0000 1.3 --- SqlBaseBuilder.cs 22 Nov 2004 03:56:08 -0000 1.4 *************** *** 5,20 **** using NHibernate.Util; ! namespace NHibernate.SqlCommand{ /// <summary> /// The base class for all of the SqlBuilders. /// </summary> ! public abstract class SqlBaseBuilder { ! protected ISessionFactoryImplementor factory; ! public SqlBaseBuilder(ISessionFactoryImplementor factory){ this.factory = factory; } /// <summary> /// Converts the ColumnNames and ColumnValues to a WhereFragment --- 5,28 ---- using NHibernate.Util; ! namespace NHibernate.SqlCommand ! { /// <summary> /// The base class for all of the SqlBuilders. /// </summary> ! public abstract class SqlBaseBuilder ! { ! private ISessionFactoryImplementor factory; ! protected SqlBaseBuilder(ISessionFactoryImplementor factory) ! { this.factory = factory; } + protected ISessionFactoryImplementor Factory + { + get { return factory; } + } + /// <summary> /// Converts the ColumnNames and ColumnValues to a WhereFragment *************** *** 36,40 **** /// <returns>A SqlString that contains the WhereFragment</returns> /// <remarks>This defaults the op to " = "</remarks> ! protected SqlString ToWhereString(string tableAlias, string[] columnNames, object[] columnValues) { return ToWhereString(tableAlias, columnNames, columnValues, " = "); } --- 44,49 ---- /// <returns>A SqlString that contains the WhereFragment</returns> /// <remarks>This defaults the op to " = "</remarks> ! protected SqlString ToWhereString(string tableAlias, string[] columnNames, object[] columnValues) ! { return ToWhereString(tableAlias, columnNames, columnValues, " = "); } *************** *** 47,51 **** /// <param name="op">The operator to use between the names & values. For example " = " or "!="</param> /// <returns>A SqlString that contains the WhereFragment</returns> ! protected SqlString ToWhereString(string[] columnNames, object[] columnValues, string op) { return ToWhereString(null, columnNames, columnValues, op); } --- 56,61 ---- /// <param name="op">The operator to use between the names & values. For example " = " or "!="</param> /// <returns>A SqlString that contains the WhereFragment</returns> ! protected SqlString ToWhereString(string[] columnNames, object[] columnValues, string op) ! { return ToWhereString(null, columnNames, columnValues, op); } *************** *** 59,76 **** /// <param name="op">The operator to use between the names & values. For example " = " or "!="</param> /// <returns>A SqlString that contains the WhereFragment</returns> ! protected SqlString ToWhereString(string tableAlias, string[] columnNames, object[] columnValues, string op) { SqlStringBuilder sqlBuilder = new SqlStringBuilder((columnNames.Length * 2) + 5); bool andNeeded = false; ! for(int i = 0; i < columnNames.Length; i++){ if(andNeeded) sqlBuilder.Add(" AND "); andNeeded = true; string columnName; ! if(tableAlias!=null && tableAlias.Length > 0) { columnName = tableAlias + StringHelper.Dot + columnNames[i]; } ! else { columnName = columnNames[i]; } --- 69,90 ---- /// <param name="op">The operator to use between the names & values. For example " = " or "!="</param> /// <returns>A SqlString that contains the WhereFragment</returns> ! protected SqlString ToWhereString(string tableAlias, string[] columnNames, object[] columnValues, string op) ! { SqlStringBuilder sqlBuilder = new SqlStringBuilder((columnNames.Length * 2) + 5); bool andNeeded = false; ! for(int i = 0; i < columnNames.Length; i++) ! { if(andNeeded) sqlBuilder.Add(" AND "); andNeeded = true; string columnName; ! if(tableAlias!=null && tableAlias.Length > 0) ! { columnName = tableAlias + StringHelper.Dot + columnNames[i]; } ! else ! { columnName = columnNames[i]; } *************** *** 78,85 **** sqlBuilder.Add(columnName) .Add(op); ! if(columnValues[i] is Parameter) { sqlBuilder.Add((Parameter)columnValues[i]); } ! else { sqlBuilder.Add((string)columnValues[i]); } --- 92,101 ---- sqlBuilder.Add(columnName) .Add(op); ! if(columnValues[i] is Parameter) ! { sqlBuilder.Add((Parameter)columnValues[i]); } ! else ! { sqlBuilder.Add((string)columnValues[i]); } *************** *** 89,93 **** } - } } --- 105,108 ---- Index: SqlInsertBuilder.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlInsertBuilder.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SqlInsertBuilder.cs 13 Sep 2004 07:22:38 -0000 1.2 --- SqlInsertBuilder.cs 22 Nov 2004 03:56:08 -0000 1.3 *************** *** 18,23 **** { private static readonly log4net.ILog log = log4net.LogManager.GetLogger( typeof(SqlInsertBuilder) ); ! ! ISessionFactoryImplementor factory; string tableName; IList columnNames = new ArrayList(); --- 18,23 ---- { private static readonly log4net.ILog log = log4net.LogManager.GetLogger( typeof(SqlInsertBuilder) ); ! ! private ISessionFactoryImplementor factory; string tableName; IList columnNames = new ArrayList(); *************** *** 45,49 **** public SqlInsertBuilder AddColumn(string[] columnNames, IType propertyType) { ! Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, propertyType); for(int i = 0; i < columnNames.Length; i++) --- 45,49 ---- public SqlInsertBuilder AddColumn(string[] columnNames, IType propertyType) { ! Parameter[] parameters = Parameter.GenerateParameters( factory, columnNames, propertyType ); for(int i = 0; i < columnNames.Length; i++) |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:54:09
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Id In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28876/Id Modified Files: IdentifierGenerationException.cs Log Message: minor fixes for FxCop rules Index: IdentifierGenerationException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Id/IdentifierGenerationException.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IdentifierGenerationException.cs 13 Sep 2004 05:37:38 -0000 1.3 --- IdentifierGenerationException.cs 22 Nov 2004 03:53:59 -0000 1.4 *************** *** 9,15 **** public class IdentifierGenerationException : HibernateException { ! public IdentifierGenerationException(string msg) : base(msg) {} ! public IdentifierGenerationException(string msg, Exception e) : base(msg, e) {} } } --- 9,15 ---- public class IdentifierGenerationException : HibernateException { ! public IdentifierGenerationException(string message) : base(message) {} ! public IdentifierGenerationException(string message, Exception e) : base(message, e) {} } } |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:53:31
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28715/Loader Modified Files: AbstractEntityLoader.cs CollectionLoader.cs EntityLoader.cs Loader.cs OneToManyLoader.cs OuterJoinLoader.cs SimpleEntityLoader.cs Log Message: removed protected fields in favor of protected properties. Index: AbstractEntityLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/AbstractEntityLoader.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** AbstractEntityLoader.cs 21 Nov 2004 22:56:29 -0000 1.11 --- AbstractEntityLoader.cs 22 Nov 2004 03:53:07 -0000 1.12 *************** *** 13,17 **** public class AbstractEntityLoader : OuterJoinLoader { ! protected ILoadable persister; private string alias; --- 13,17 ---- public class AbstractEntityLoader : OuterJoinLoader { ! private ILoadable persister; private string alias; *************** *** 27,30 **** --- 27,38 ---- } + /// <summary> + /// Gets the <see cref="ILoadable"/> Persister. + /// </summary> + protected ILoadable Persister + { + get { return persister; } + } + protected void RenderStatement(SqlSelectBuilder selectBuilder, ISessionFactoryImplementor factory) { *************** *** 63,71 **** .SetOrderByClause(orderBy); ! ! classPersisters = new ILoadable[joins+1]; ! lockModeArray = CreateLockModeArray(joins+1, LockMode.None); ! for (int i=0; i<joins; i++) classPersisters[i] = ((OuterJoinableAssociation)associations[i]).Subpersister; ! classPersisters[joins] = persister; } --- 71,82 ---- .SetOrderByClause(orderBy); ! Persisters = new ILoadable[joins+1]; ! // classPersisters = new ILoadable[joins+1]; ! LockModeArray = CreateLockModeArray(joins+1, LockMode.None); ! for (int i=0; i<joins; i++) ! { ! Persisters[i] = ((OuterJoinableAssociation)associations[i]).Subpersister; ! } ! Persisters[joins] = persister; } *************** *** 112,119 **** this.SqlString = sqlBuilder.ToSqlString(); ! classPersisters = new ILoadable[joins+1]; ! lockModeArray = CreateLockModeArray(joins+1, LockMode.None); ! for (int i=0; i<joins; i++) classPersisters[i] = ((OuterJoinableAssociation)associations[i]).Subpersister; ! classPersisters[joins] = persister; } --- 123,133 ---- this.SqlString = sqlBuilder.ToSqlString(); ! Persisters = new ILoadable[joins+1]; ! LockModeArray = CreateLockModeArray(joins+1, LockMode.None); ! for (int i=0; i<joins; i++) ! { ! Persisters[i] = ((OuterJoinableAssociation)associations[i]).Subpersister; ! } ! Persisters[joins] = persister; } Index: OneToManyLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OneToManyLoader.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** OneToManyLoader.cs 21 Nov 2004 22:56:29 -0000 1.11 --- OneToManyLoader.cs 22 Nov 2004 03:53:07 -0000 1.12 *************** *** 83,90 **** ! classPersisters = new ILoadable[joins+1]; ! lockModeArray = CreateLockModeArray(joins+1, LockMode.None); ! for (int i=0; i<joins; i++) classPersisters[i] = ((OuterJoinableAssociation) associations[i]).Subpersister; ! classPersisters[joins] = persister; PostInstantiate(); --- 83,93 ---- ! Persisters = new ILoadable[joins+1]; ! LockModeArray = CreateLockModeArray(joins+1, LockMode.None); ! for (int i=0; i<joins; i++) ! { ! Persisters[i] = ((OuterJoinableAssociation) associations[i]).Subpersister; ! } ! Persisters[joins] = persister; PostInstantiate(); Index: CollectionLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/CollectionLoader.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CollectionLoader.cs 21 Nov 2004 22:56:29 -0000 1.10 --- CollectionLoader.cs 22 Nov 2004 03:53:07 -0000 1.11 *************** *** 56,62 **** this.SqlString = selectBuilder.ToSqlString(); ! classPersisters = new ILoadable[joins]; ! lockModeArray = CreateLockModeArray(joins, LockMode.None); ! for (int i=0; i<joins; i++) classPersisters[i] = (ILoadable) ((OuterJoinableAssociation) associations[i]).Subpersister; this.collectionPersister = persister; --- 56,65 ---- this.SqlString = selectBuilder.ToSqlString(); ! Persisters = new ILoadable[joins]; ! LockModeArray = CreateLockModeArray(joins, LockMode.None); ! for (int i=0; i<joins; i++) ! { ! Persisters[i] = (ILoadable) ((OuterJoinableAssociation) associations[i]).Subpersister; ! } this.collectionPersister = persister; Index: OuterJoinLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OuterJoinLoader.cs,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** OuterJoinLoader.cs 21 Nov 2004 22:56:29 -0000 1.15 --- OuterJoinLoader.cs 22 Nov 2004 03:53:07 -0000 1.16 *************** *** 29,34 **** protected static readonly string[] NoStrings = new string[0]; protected static readonly ILoadable[] NoPersisters = new ILoadable[0]; ! protected ILoadable[] classPersisters; ! protected LockMode[] lockModeArray; private SqlString sqlString; --- 29,35 ---- protected static readonly string[] NoStrings = new string[0]; protected static readonly ILoadable[] NoPersisters = new ILoadable[0]; ! ! private ILoadable[] classPersisters; ! private LockMode[] lockModeArray; private SqlString sqlString; *************** *** 380,386 **** } ! public override ILoadable[] Persisters { get { return classPersisters; } } --- 381,394 ---- } ! protected override ILoadable[] Persisters { get { return classPersisters; } + set { classPersisters = value; } + } + + protected LockMode[] LockModeArray + { + get { return lockModeArray; } + set { lockModeArray = value; } } *************** *** 445,449 **** //TODO: H2.0.3 - changes tableName to lower case - don't know why it is needed... ! return ( new Alias(10, n.ToString() + StringHelper.Underscore) ).ToAliasString( tableName, dialect ); } --- 453,457 ---- //TODO: H2.0.3 - changes tableName to lower case - don't know why it is needed... ! return ( new Alias(10, n.ToString() + StringHelper.Underscore) ).ToAliasString( tableName, Dialect ); } *************** *** 460,464 **** public JoinFragment OuterJoins(IList associations) { ! JoinFragment outerjoin = dialect.CreateOuterJoinFragment(); foreach(OuterJoinLoader.OuterJoinableAssociation oj in associations) { --- 468,472 ---- public JoinFragment OuterJoins(IList associations) { ! JoinFragment outerjoin = Dialect.CreateOuterJoinFragment(); foreach(OuterJoinLoader.OuterJoinableAssociation oj in associations) { Index: SimpleEntityLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/SimpleEntityLoader.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SimpleEntityLoader.cs 21 Nov 2004 22:56:29 -0000 1.8 --- SimpleEntityLoader.cs 22 Nov 2004 03:53:07 -0000 1.9 *************** *** 40,51 **** } ! public override ILoadable[] Persisters { get { return persister; } } protected override CollectionPersister CollectionPersister { get { return null; } } protected override string[] Suffixes { --- 40,54 ---- } ! protected override ILoadable[] Persisters { get { return persister; } + set { persister = value; } } + protected override CollectionPersister CollectionPersister { get { return null; } } + protected override string[] Suffixes { Index: Loader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/Loader.cs,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Loader.cs 21 Nov 2004 22:56:29 -0000 1.40 --- Loader.cs 22 Nov 2004 03:53:07 -0000 1.41 *************** *** 20,29 **** /// This class implements useful common funtionality that concrete loaders would delegate to. /// It is not intended that this functionality would be directly accessed by client code (Hence, ! /// all methods of this class will eventually be declared <c>protected</c> /// </remarks> public abstract class Loader { private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(Loader)); ! public Dialect.Dialect dialect; protected Loader(Dialect.Dialect dialect) --- 20,29 ---- /// This class implements useful common funtionality that concrete loaders would delegate to. /// It is not intended that this functionality would be directly accessed by client code (Hence, ! /// all methods of this class are declared <c>protected</c>.) /// </remarks> public abstract class Loader { private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(Loader)); ! private Dialect.Dialect dialect; protected Loader(Dialect.Dialect dialect) *************** *** 33,39 **** /// <summary> /// The SqlString to be called; implemented by all subclasses /// </summary> ! /// <remarks>TODO: add something about internal</remarks> protected internal abstract SqlString SqlString {get; set;} --- 33,58 ---- /// <summary> + /// Gets a reference to the <see cref="Dialect.Dialect"/> to use + /// when building the <see cref="SqlString"/>. + /// </summary> + protected internal Dialect.Dialect Dialect + { + get { return dialect; } + } + + /// <summary> /// The SqlString to be called; implemented by all subclasses /// </summary> ! /// <remarks> ! /// <p> ! /// The <c>setter</c> was added so that class inheriting from Loader could write a ! /// value using the Property instead of directly to the field. ! /// </p> ! /// <p> ! /// The scope is <c>internal</c> because the <see cref="Hql.WhereParser"/> needs to ! /// be able to <c>get</c> the SqlString of the <see cref="Hql.QueryTranslator"/> when ! /// it is parsing a subquery. ! /// </p> ! /// </remarks> protected internal abstract SqlString SqlString {get; set;} *************** *** 42,46 **** /// implemented by all subclasses /// </summary> ! public abstract ILoadable[] Persisters { get; } /// <summary> --- 61,71 ---- /// implemented by all subclasses /// </summary> ! /// <remarks> ! /// <p> ! /// The <c>setter</c> was added so that classes inheriting from Loader could write a ! /// value using the Property instead of directly to the field. ! /// </p> ! /// </remarks> ! protected abstract ILoadable[] Persisters { get; set; } /// <summary> Index: EntityLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/EntityLoader.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EntityLoader.cs 21 Nov 2004 22:56:29 -0000 1.6 --- EntityLoader.cs 22 Nov 2004 03:53:07 -0000 1.7 *************** *** 49,53 **** id + ", for class: " + ! persister.ClassName); } } --- 49,53 ---- id + ", for class: " + ! Persister.ClassName); } } |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:53:27
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28715/Hql Modified Files: ClauseParser.cs QueryTranslator.cs WhereParser.cs Log Message: removed protected fields in favor of protected properties. Index: ClauseParser.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/ClauseParser.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ClauseParser.cs 30 Apr 2004 08:34:25 -0000 1.6 --- ClauseParser.cs 22 Nov 2004 03:53:07 -0000 1.7 *************** *** 53,57 **** { EndChild(q); ! child = new WhereParser(q.dialect); child.Start(q); } --- 53,57 ---- { EndChild(q); ! child = new WhereParser( q.Dialect ); child.Start(q); } *************** *** 65,69 **** { EndChild(q); ! child = new HavingParser(q.dialect); child.Start(q); } --- 65,69 ---- { EndChild(q); ! child = new HavingParser( q.Dialect ); child.Start(q); } Index: WhereParser.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/WhereParser.cs,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** WhereParser.cs 20 Nov 2004 15:49:38 -0000 1.24 --- WhereParser.cs 22 Nov 2004 03:53:07 -0000 1.25 *************** *** 260,264 **** throw new QueryException("MappingException occurred compiling subquery", me); } ! // AppendToken( q, subq.SQLString); AppendToken(q, subq.SqlString); inSubselect = false; --- 260,264 ---- throw new QueryException("MappingException occurred compiling subquery", me); } ! AppendToken(q, subq.SqlString); inSubselect = false; Index: QueryTranslator.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/QueryTranslator.cs,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** QueryTranslator.cs 21 Nov 2004 22:56:28 -0000 1.48 --- QueryTranslator.cs 22 Nov 2004 03:53:07 -0000 1.49 *************** *** 169,178 **** /// Persisters for the return values of a <c>Find</c> style query /// </summary> ! public override ILoadable[] Persisters { ! get ! { ! return persisters; ! } } --- 169,181 ---- /// Persisters for the return values of a <c>Find</c> style query /// </summary> ! /// <remarks> ! /// The <c>Persisters</c> stored by QueryTranslator have to be <see cref="IQueryable"/>. The ! /// <c>setter</c> will attempt to cast the <c>ILoadable</c> array passed in into an ! /// <c>IQueryable</c> array. ! /// </remarks> ! protected override ILoadable[] Persisters { ! get { return persisters; } ! set { persisters = (IQueryable[])value; } } *************** *** 281,285 **** // we want! return new SqlCommand.Alias(10, NextCount().ToString() + StringHelper.Underscore) ! .ToAliasString(StringHelper.Unqualify(description).ToLower(), dialect); } --- 284,288 ---- // we want! return new SqlCommand.Alias(10, NextCount().ToString() + StringHelper.Underscore) ! .ToAliasString(StringHelper.Unqualify(description).ToLower(), Dialect ); } |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:52:58
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Property In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28506/Property Modified Files: PropertyAccessorFactory.cs Log Message: modified Factory/Helper classes to be sealed since they are not extendable or creatable. Index: PropertyAccessorFactory.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Property/PropertyAccessorFactory.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PropertyAccessorFactory.cs 23 Oct 2004 15:44:09 -0000 1.6 --- PropertyAccessorFactory.cs 22 Nov 2004 03:52:17 -0000 1.7 *************** *** 10,14 **** /// Factory for creating the various PropertyAccessor strategies. /// </summary> ! public class PropertyAccessorFactory { private static IDictionary accessors; --- 10,14 ---- /// Factory for creating the various PropertyAccessor strategies. /// </summary> ! public sealed class PropertyAccessorFactory { private static IDictionary accessors; |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:52:58
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Connection In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28506/Connection Modified Files: ConnectionProviderFactory.cs Log Message: modified Factory/Helper classes to be sealed since they are not extendable or creatable. Index: ConnectionProviderFactory.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Connection/ConnectionProviderFactory.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ConnectionProviderFactory.cs 16 Aug 2004 05:10:20 -0000 1.6 --- ConnectionProviderFactory.cs 22 Nov 2004 03:52:17 -0000 1.7 *************** *** 11,15 **** /// Instanciates a connection provider given configuration properties. /// </summary> ! public class ConnectionProviderFactory { private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ConnectionProviderFactory)); --- 11,15 ---- /// Instanciates a connection provider given configuration properties. /// </summary> ! public sealed class ConnectionProviderFactory { private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ConnectionProviderFactory)); |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:52:58
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28506/Util Modified Files: ObjectUtils.cs ReflectHelper.cs StringHelper.cs Log Message: modified Factory/Helper classes to be sealed since they are not extendable or creatable. Index: ObjectUtils.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/ObjectUtils.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ObjectUtils.cs 7 Mar 2003 15:07:01 -0000 1.2 --- ObjectUtils.cs 22 Nov 2004 03:52:18 -0000 1.3 *************** *** 56,66 **** using System; ! namespace NHibernate.Util { /// <summary> /// Summary description for ObjectUtils. /// </summary> ! public class ObjectUtils { ! private ObjectUtils() {} public static object DefaultIfNull(object obj, object defaultVal) { --- 56,71 ---- using System; ! namespace NHibernate.Util ! { /// <summary> /// Summary description for ObjectUtils. /// </summary> ! public sealed class ObjectUtils ! { ! private ObjectUtils() ! { ! // not creatable ! } public static object DefaultIfNull(object obj, object defaultVal) { Index: ReflectHelper.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/ReflectHelper.cs,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ReflectHelper.cs 23 Oct 2004 15:01:23 -0000 1.17 --- ReflectHelper.cs 22 Nov 2004 03:52:18 -0000 1.18 *************** *** 13,16 **** --- 13,21 ---- public sealed class ReflectHelper { + private ReflectHelper() + { + // not creatable + } + private static System.Type[] NoClasses = new System.Type[0]; private static System.Type[] Object = new System.Type[] { typeof(object) }; Index: StringHelper.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/StringHelper.cs,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** StringHelper.cs 19 Aug 2004 17:53:55 -0000 1.15 --- StringHelper.cs 22 Nov 2004 03:52:18 -0000 1.16 *************** *** 3,10 **** using System.Collections; ! namespace NHibernate.Util { ! public sealed class StringHelper { ! public const char Dot = '.'; public const char Underscore = '_'; --- 3,16 ---- using System.Collections; ! namespace NHibernate.Util ! { ! public sealed class StringHelper ! { ! private StringHelper() ! { ! // not creatable ! } ! public const char Dot = '.'; public const char Underscore = '_'; |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:52:57
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlTypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28506/SqlTypes Modified Files: SqlTypeFactory.cs Log Message: modified Factory/Helper classes to be sealed since they are not extendable or creatable. Index: SqlTypeFactory.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlTypes/SqlTypeFactory.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SqlTypeFactory.cs 9 Aug 2004 03:33:54 -0000 1.7 --- SqlTypeFactory.cs 22 Nov 2004 03:52:18 -0000 1.8 *************** *** 8,12 **** /// </summary> [Serializable] ! public class SqlTypeFactory { // key = typeof(sqlType).Name : ie - BinarySqlType(l), BooleanSqlType, DecimalSqlType(p,s) --- 8,12 ---- /// </summary> [Serializable] ! public sealed class SqlTypeFactory { // key = typeof(sqlType).Name : ie - BinarySqlType(l), BooleanSqlType, DecimalSqlType(p,s) |
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27947 Modified Files: ADOException.cs AssertionFailure.cs HibernateException.cs InstantiationException.cs LazyInitializationException.cs MappingException.cs ObjectDeletedException.cs ObjectNotFoundException.cs PersistentObjectException.cs PropertyAccessException.cs PropertyNotFoundException.cs QueryException.cs TransactionException.cs TransientObjectException.cs WrongClassException.cs Log Message: minor fixes for FxCop rules Index: ObjectDeletedException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/ObjectDeletedException.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ObjectDeletedException.cs 21 Sep 2004 12:43:26 -0000 1.3 --- ObjectDeletedException.cs 22 Nov 2004 03:50:03 -0000 1.4 *************** *** 12,16 **** private object identifier; ! public ObjectDeletedException(string msg, object identifier) : base(msg) { this.identifier = identifier; --- 12,16 ---- private object identifier; ! public ObjectDeletedException(string message, object identifier) : base(message) { this.identifier = identifier; *************** *** 27,33 **** } ! public ObjectDeletedException(string msg, Exception root) : this(msg, root.Message) {} ! public ObjectDeletedException(string msg) : this(msg, msg) {} public ObjectDeletedException(Exception root) : this(root.Message, root.Message) {} --- 27,33 ---- } ! public ObjectDeletedException(string message, Exception root) : this(message, root.Message) {} ! public ObjectDeletedException(string message) : this(message, message) {} public ObjectDeletedException(Exception root) : this(root.Message, root.Message) {} Index: PropertyAccessException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/PropertyAccessException.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PropertyAccessException.cs 13 Sep 2004 05:37:37 -0000 1.2 --- PropertyAccessException.cs 22 Nov 2004 03:50:03 -0000 1.3 *************** *** 13,17 **** private bool wasSetter; ! public PropertyAccessException(Exception root, string s, bool wasSetter, System.Type persistentType, string propertyName) : base(s, root) { this.persistentType = persistentType; --- 13,17 ---- private bool wasSetter; ! public PropertyAccessException(Exception root, string message, bool wasSetter, System.Type persistentType, string propertyName) : base(message, root) { this.persistentType = persistentType; Index: PersistentObjectException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/PersistentObjectException.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PersistentObjectException.cs 13 Sep 2004 05:37:37 -0000 1.2 --- PersistentObjectException.cs 22 Nov 2004 03:50:03 -0000 1.3 *************** *** 10,14 **** public class PersistentObjectException : HibernateException { ! public PersistentObjectException(string s) : base(s) {} } } --- 10,14 ---- public class PersistentObjectException : HibernateException { ! public PersistentObjectException(string message) : base(message) {} } } Index: QueryException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/QueryException.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** QueryException.cs 13 Sep 2004 05:37:37 -0000 1.2 --- QueryException.cs 22 Nov 2004 03:50:03 -0000 1.3 *************** *** 11,17 **** private string queryString; ! public QueryException(string msg) : base(msg) {} ! public QueryException(string msg, Exception e) : base(msg, e) {} public QueryException(Exception e) : base(e) {} --- 11,17 ---- private string queryString; ! public QueryException(string message) : base(message) {} ! public QueryException(string message, Exception e) : base(message, e) {} public QueryException(Exception e) : base(e) {} Index: TransactionException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/TransactionException.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TransactionException.cs 13 Sep 2004 05:37:37 -0000 1.2 --- TransactionException.cs 22 Nov 2004 03:50:03 -0000 1.3 *************** *** 9,15 **** public class TransactionException : HibernateException { ! public TransactionException(string msg, Exception root) : base(msg, root) {} ! public TransactionException(string msg) : base(msg) {} } } --- 9,15 ---- public class TransactionException : HibernateException { ! public TransactionException(string message, Exception root) : base(message, root) {} ! public TransactionException(string message) : base(message) {} } } Index: ObjectNotFoundException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/ObjectNotFoundException.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ObjectNotFoundException.cs 21 Sep 2004 12:43:26 -0000 1.3 --- ObjectNotFoundException.cs 22 Nov 2004 03:50:03 -0000 1.4 *************** *** 14,18 **** private System.Type type; ! public ObjectNotFoundException(string msg, object identifier, System.Type type) : base(msg) { this.identifier = identifier; --- 14,18 ---- private System.Type type; ! public ObjectNotFoundException(string message, object identifier, System.Type type) : base(message) { this.identifier = identifier; *************** *** 34,40 **** get { return type; } } ! public ObjectNotFoundException(string msg, Exception root) : this(msg, root.Message, typeof(ObjectNotFoundException)) {} ! public ObjectNotFoundException(string msg) : this(msg, msg, typeof(ObjectNotFoundException)) {} public ObjectNotFoundException(Exception root) : this(root.Message, root.Message, typeof(ObjectNotFoundException)) {} --- 34,40 ---- get { return type; } } ! public ObjectNotFoundException(string message, Exception root) : this(message, root.Message, typeof(ObjectNotFoundException)) {} ! public ObjectNotFoundException(string message) : this(message, message, typeof(ObjectNotFoundException)) {} public ObjectNotFoundException(Exception root) : this(root.Message, root.Message, typeof(ObjectNotFoundException)) {} Index: MappingException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/MappingException.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MappingException.cs 21 Sep 2004 12:43:26 -0000 1.4 --- MappingException.cs 22 Nov 2004 03:50:03 -0000 1.5 *************** *** 11,19 **** public class MappingException : HibernateException { ! public MappingException(string msg, Exception root) : base(msg, root) {} public MappingException(Exception root) : base(root) { } ! public MappingException(string msg) : base(msg) {} public MappingException() : base() {} --- 11,19 ---- public class MappingException : HibernateException { ! public MappingException(string message, Exception root) : base(message, root) {} public MappingException(Exception root) : base(root) { } ! public MappingException(string message) : base(message) {} public MappingException() : base() {} Index: AssertionFailure.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/AssertionFailure.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AssertionFailure.cs 21 Sep 2004 12:43:26 -0000 1.4 --- AssertionFailure.cs 22 Nov 2004 03:50:03 -0000 1.5 *************** *** 15,24 **** } ! public AssertionFailure(string s) : base(s) { log4net.LogManager.GetLogger( typeof(AssertionFailure) ).Error("An AssertionFailure occured - this may indicate a bug in NHibernate", this); } ! public AssertionFailure(string s, Exception e) : base(s, e) { log4net.LogManager.GetLogger( typeof(AssertionFailure) ).Error("An AssertionFailure occured - this may indicate a bug in NHibernate", e); --- 15,24 ---- } ! public AssertionFailure(string message) : base(message) { log4net.LogManager.GetLogger( typeof(AssertionFailure) ).Error("An AssertionFailure occured - this may indicate a bug in NHibernate", this); } ! public AssertionFailure(string message, Exception e) : base(message, e) { log4net.LogManager.GetLogger( typeof(AssertionFailure) ).Error("An AssertionFailure occured - this may indicate a bug in NHibernate", e); Index: HibernateException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/HibernateException.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** HibernateException.cs 20 Sep 2004 17:49:25 -0000 1.5 --- HibernateException.cs 22 Nov 2004 03:50:03 -0000 1.6 *************** *** 16,22 **** public HibernateException(Exception e) : base(String.Empty, e) { } ! public HibernateException(string str, Exception e) : base(str, e) { } ! public HibernateException(string str) : base(str) { } protected HibernateException(SerializationInfo info, StreamingContext context) : base(info, context) { } --- 16,22 ---- public HibernateException(Exception e) : base(String.Empty, e) { } ! public HibernateException(string message, Exception e) : base(message, e) { } ! public HibernateException(string message) : base(message) { } protected HibernateException(SerializationInfo info, StreamingContext context) : base(info, context) { } Index: TransientObjectException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/TransientObjectException.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TransientObjectException.cs 13 Sep 2004 05:37:37 -0000 1.2 --- TransientObjectException.cs 22 Nov 2004 03:50:03 -0000 1.3 *************** *** 10,14 **** public class TransientObjectException : HibernateException { ! public TransientObjectException(string msg): base(msg) { } } } --- 10,14 ---- public class TransientObjectException : HibernateException { ! public TransientObjectException(string message): base(message) { } } } Index: PropertyNotFoundException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/PropertyNotFoundException.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PropertyNotFoundException.cs 13 Sep 2004 05:37:37 -0000 1.2 --- PropertyNotFoundException.cs 22 Nov 2004 03:50:03 -0000 1.3 *************** *** 9,15 **** public class PropertyNotFoundException : MappingException { ! public PropertyNotFoundException(string msg, Exception root) : base(msg, root) {} public PropertyNotFoundException(Exception root) : base(root) {} ! public PropertyNotFoundException(string msg) : base(msg) {} } } --- 9,15 ---- public class PropertyNotFoundException : MappingException { ! public PropertyNotFoundException(string message, Exception root) : base(message, root) {} public PropertyNotFoundException(Exception root) : base(root) {} ! public PropertyNotFoundException(string message) : base(message) {} } } Index: WrongClassException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/WrongClassException.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WrongClassException.cs 13 Sep 2004 05:37:37 -0000 1.2 --- WrongClassException.cs 22 Nov 2004 03:50:03 -0000 1.3 *************** *** 13,17 **** private System.Type type; ! public WrongClassException(string msg, object identifier, System.Type type) : base(msg) { this.identifier = identifier; --- 13,17 ---- private System.Type type; ! public WrongClassException(string message, object identifier, System.Type type) : base(message) { this.identifier = identifier; Index: ADOException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/ADOException.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ADOException.cs 21 Sep 2004 12:43:26 -0000 1.6 --- ADOException.cs 22 Nov 2004 03:50:03 -0000 1.7 *************** *** 15,26 **** public ADOException() : this("DataException occured", new InvalidOperationException("Invalid Operation")) { } ! public ADOException(string str) : this(str, new InvalidOperationException("Invalid Operation")) { } public ADOException(DataException root) : this("DataException occurred", root) { } ! public ADOException(string str, Exception root) : base(str, root) { sqle = root; ! log4net.LogManager.GetLogger( typeof(ADOException) ).Error(str, root); } --- 15,26 ---- public ADOException() : this("DataException occured", new InvalidOperationException("Invalid Operation")) { } ! public ADOException(string message) : this(message, new InvalidOperationException("Invalid Operation")) { } public ADOException(DataException root) : this("DataException occurred", root) { } ! public ADOException(string message, Exception root) : base(message, root) { sqle = root; ! log4net.LogManager.GetLogger( typeof(ADOException) ).Error(message, root); } Index: LazyInitializationException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/LazyInitializationException.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LazyInitializationException.cs 21 Sep 2004 12:43:26 -0000 1.4 --- LazyInitializationException.cs 22 Nov 2004 03:50:03 -0000 1.5 *************** *** 13,22 **** public LazyInitializationException(Exception root) : this(root.Message) {} ! public LazyInitializationException(string msg) : base(msg) { ! log4net.LogManager.GetLogger( typeof(LazyInitializationException) ).Error(msg, this); } ! public LazyInitializationException(string msg, Exception root) : this(msg + " " + root.Message) {} public LazyInitializationException() : this("LazyInitalizationException") {} --- 13,22 ---- public LazyInitializationException(Exception root) : this(root.Message) {} ! public LazyInitializationException(string message) : base(message) { ! log4net.LogManager.GetLogger( typeof(LazyInitializationException) ).Error(message, this); } ! public LazyInitializationException(string message, Exception root) : this(message + " " + root.Message) {} public LazyInitializationException() : this("LazyInitalizationException") {} Index: InstantiationException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/InstantiationException.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InstantiationException.cs 21 Sep 2004 12:43:26 -0000 1.3 --- InstantiationException.cs 22 Nov 2004 03:50:03 -0000 1.4 *************** *** 12,16 **** private System.Type type; ! public InstantiationException(string s, System.Type type, Exception root) : base(s, root) { this.type = type; --- 12,17 ---- private System.Type type; ! public InstantiationException(string message, System.Type type, Exception root) ! : base(message, root) { this.type = type; *************** *** 27,33 **** } ! public InstantiationException(string s, Exception root) : this(s, typeof(InstantiationException), root) {} ! public InstantiationException(string s) : this(s, typeof(InstantiationException), new InvalidOperationException("Invalid Operation")) {} public InstantiationException() : this("Exception occured", typeof(InstantiationException), new InvalidOperationException("Invalid Operation")) {} --- 28,34 ---- } ! public InstantiationException(string message, Exception root) : this(message, typeof(InstantiationException), root) {} ! public InstantiationException(string message) : this(message, typeof(InstantiationException), new InvalidOperationException("Invalid Operation")) {} public InstantiationException() : this("Exception occured", typeof(InstantiationException), new InvalidOperationException("Invalid Operation")) {} |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:51:20
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27947/Cache Modified Files: CacheException.cs Log Message: minor fixes for FxCop rules Index: CacheException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cache/CacheException.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CacheException.cs 13 Sep 2004 05:37:38 -0000 1.2 --- CacheException.cs 22 Nov 2004 03:50:04 -0000 1.3 *************** *** 9,13 **** public class CacheException : HibernateException { ! public CacheException(string s) : base(s) { } public CacheException(Exception e) : base(e) { } --- 9,13 ---- public class CacheException : HibernateException { ! public CacheException(string message) : base(message) { } public CacheException(Exception e) : base(e) { } |
|
From: Michael D. <mik...@us...> - 2004-11-22 03:51:19
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27947/Type Modified Files: SerializationException.cs Log Message: minor fixes for FxCop rules Index: SerializationException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/SerializationException.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SerializationException.cs 13 Sep 2004 05:37:38 -0000 1.3 --- SerializationException.cs 22 Nov 2004 03:50:04 -0000 1.4 *************** *** 9,13 **** public class SerializationException : HibernateException { ! public SerializationException(string msg, Exception root) : base(msg, root) { } } } --- 9,13 ---- public class SerializationException : HibernateException { ! public SerializationException(string message, Exception root) : base(message, root) { } } } |
|
From: Michael D. <mik...@us...> - 2004-11-21 23:32:46
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Proxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1408/Proxy Modified Files: HibernateProxy.cs LazyInitializer.cs Log Message: NHibernate is now CLSCompliant Index: LazyInitializer.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Proxy/LazyInitializer.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LazyInitializer.cs 22 Apr 2003 14:07:21 -0000 1.1 --- LazyInitializer.cs 21 Nov 2004 22:56:30 -0000 1.2 *************** *** 12,23 **** /// Summary description for LazyInitializer. /// </summary> ! public abstract class LazyInitializer { protected static readonly object INVOKE_IMPLEMENTATION = new object(); ! protected object target = null; ! protected object id; ! protected ISessionImplementor session; ! protected System.Type persistentClass; ! protected MethodInfo getIdentifierMethod; ! protected bool overridesEquals; public LazyInitializer(System.Type persistentClass, object id, MethodInfo getIdentifierMethod, ISessionImplementor session) { --- 12,25 ---- /// Summary description for LazyInitializer. /// </summary> ! public abstract class LazyInitializer ! { protected static readonly object INVOKE_IMPLEMENTATION = new object(); ! ! private object target = null; ! private object id; ! private ISessionImplementor session; ! private System.Type persistentClass; ! private MethodInfo getIdentifierMethod; ! private bool overridesEquals; public LazyInitializer(System.Type persistentClass, object id, MethodInfo getIdentifierMethod, ISessionImplementor session) { Index: HibernateProxy.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Proxy/HibernateProxy.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HibernateProxy.cs 7 Mar 2003 19:26:46 -0000 1.2 --- HibernateProxy.cs 21 Nov 2004 22:56:30 -0000 1.3 *************** *** 11,20 **** private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(HibernateProxy)); ! protected object target = null; ! protected object id; ! protected ISessionImplementor session; ! protected System.Type persistentClass; ! protected PropertyInfo identifierProperty; ! protected bool overridesEquals; private HibernateProxy(System.Type type, object id, PropertyInfo identifierProperty, ISessionImplementor session ) : base(type) { --- 11,20 ---- private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(HibernateProxy)); ! private object target = null; ! private object id; ! private ISessionImplementor session; ! private System.Type persistentClass; ! private PropertyInfo identifierProperty; ! private bool overridesEquals; private HibernateProxy(System.Type type, object id, PropertyInfo identifierProperty, ISessionImplementor session ) : base(type) { |
|
From: Michael D. <mik...@us...> - 2004-11-21 23:25:50
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Connection In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1408/Connection Modified Files: ConnectionProvider.cs Log Message: NHibernate is now CLSCompliant Index: ConnectionProvider.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Connection/ConnectionProvider.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ConnectionProvider.cs 1 Sep 2004 03:28:28 -0000 1.7 --- ConnectionProvider.cs 21 Nov 2004 22:56:28 -0000 1.8 *************** *** 15,19 **** private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ConnectionProvider)); private string connString = null; ! protected IDriver driver = null; public virtual void CloseConnection(IDbConnection conn) --- 15,19 ---- private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ConnectionProvider)); private string connString = null; ! private IDriver driver = null; public virtual void CloseConnection(IDbConnection conn) |
|
From: Michael D. <mik...@us...> - 2004-11-21 22:58:57
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1408/Collection Modified Files: Set.cs SortedSet.cs Log Message: NHibernate is now CLSCompliant Index: SortedSet.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/SortedSet.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SortedSet.cs 18 Nov 2004 14:40:33 -0000 1.9 --- SortedSet.cs 21 Nov 2004 22:56:27 -0000 1.10 *************** *** 22,27 **** protected override object Snapshot(CollectionPersister persister) { ! SortedList clonedSet = new SortedList(comparer, _set.Count); ! foreach(object obj in _set) { object copy = persister.ElementType.DeepCopy( obj ); --- 22,27 ---- protected override object Snapshot(CollectionPersister persister) { ! SortedList clonedSet = new SortedList(comparer, internalSet.Count); ! foreach(object obj in internalSet) { object copy = persister.ElementType.DeepCopy( obj ); *************** *** 40,44 **** public override void BeforeInitialize(CollectionPersister persister) { ! _set = new Iesi.Collections.SortedSet( Comparer ); // an ArrayList of the identifiers is what Set uses because there is not // both a Key & Value to worry about - just the Key. --- 40,44 ---- public override void BeforeInitialize(CollectionPersister persister) { ! internalSet = new Iesi.Collections.SortedSet( Comparer ); // an ArrayList of the identifiers is what Set uses because there is not // both a Key & Value to worry about - just the Key. *************** *** 75,79 **** { object newObject = persister.ElementType.Assemble(array[i], session, owner); ! _set.Add( newObject ); } --- 75,79 ---- { object newObject = persister.ElementType.Assemble(array[i], session, owner); ! internalSet.Add( newObject ); } Index: Set.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/Set.cs,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Set.cs 18 Nov 2004 14:40:33 -0000 1.18 --- Set.cs 21 Nov 2004 22:56:27 -0000 1.19 *************** *** 20,24 **** public class Set : PersistentCollection, Iesi.Collections.ISet { ! protected Iesi.Collections.ISet _set; [NonSerialized] protected IList tempIdentifierList; --- 20,24 ---- public class Set : PersistentCollection, Iesi.Collections.ISet { ! protected Iesi.Collections.ISet internalSet; [NonSerialized] protected IList tempIdentifierList; *************** *** 31,36 **** protected override object Snapshot(CollectionPersister persister) { ! Hashtable clonedMap = new Hashtable( _set.Count ); ! foreach( object obj in _set ) { object copied = persister.ElementType.DeepCopy( obj ); --- 31,36 ---- protected override object Snapshot(CollectionPersister persister) { ! Hashtable clonedMap = new Hashtable( internalSet.Count ); ! foreach( object obj in internalSet ) { object copied = persister.ElementType.DeepCopy( obj ); *************** *** 45,49 **** ArrayList result = new ArrayList(sn.Keys.Count); result.AddRange(sn.Keys); ! PersistentCollection.IdentityRemoveAll( result,_set, session ); return result; } --- 45,49 ---- ArrayList result = new ArrayList(sn.Keys.Count); result.AddRange(sn.Keys); ! PersistentCollection.IdentityRemoveAll( result, internalSet, session ); return result; } *************** *** 55,59 **** { IDictionary snapshot = (IDictionary) GetSnapshot(); ! if ( snapshot.Count!= _set.Count ) { return false; --- 55,59 ---- { IDictionary snapshot = (IDictionary) GetSnapshot(); ! if ( snapshot.Count!= internalSet.Count ) { return false; *************** *** 61,65 **** else { ! foreach( object obj in _set ) { object oldValue = snapshot[ obj ]; --- 61,65 ---- else { ! foreach( object obj in internalSet ) { object oldValue = snapshot[ obj ]; *************** *** 86,90 **** public Set(ISessionImplementor session, Iesi.Collections.ISet collection) : base(session) { ! _set = collection; initialized = true; directlyAccessible = true; --- 86,90 ---- public Set(ISessionImplementor session, Iesi.Collections.ISet collection) : base(session) { ! internalSet = collection; initialized = true; directlyAccessible = true; *************** *** 98,102 **** for (int i=0; i<array.Length; i+=2) { ! _set.Add( persister.ElementType.Assemble( array[i], session, owner ) ); } initialized = true; --- 98,102 ---- for (int i=0; i<array.Length; i+=2) { ! internalSet.Add( persister.ElementType.Assemble( array[i], session, owner ) ); } initialized = true; *************** *** 110,118 **** if(persister.HasOrdering) { ! _set = new Iesi.Collections.ListSet(); } else { ! _set = new Iesi.Collections.HashedSet(); } } --- 110,118 ---- if(persister.HasOrdering) { ! internalSet = new Iesi.Collections.ListSet(); } else { ! internalSet = new Iesi.Collections.HashedSet(); } } *************** *** 128,132 **** { Read(); ! _set.CopyTo( array, index ); } --- 128,132 ---- { Read(); ! internalSet.CopyTo( array, index ); } *************** *** 139,143 **** { Read(); ! return _set.Count; } } --- 139,143 ---- { Read(); ! return internalSet.Count; } } *************** *** 166,170 **** { Write(); ! return _set.Add( value ); } --- 166,170 ---- { Write(); ! return internalSet.Add( value ); } *************** *** 172,176 **** { Write(); ! _set.Clear(); } --- 172,176 ---- { Write(); ! internalSet.Clear(); } *************** *** 178,182 **** { Read(); ! return _set.Contains( key ); } --- 178,182 ---- { Read(); ! return internalSet.Contains( key ); } *************** *** 184,188 **** { Read(); ! return _set.ContainsAll( c ); } --- 184,188 ---- { Read(); ! return internalSet.ContainsAll( c ); } *************** *** 190,194 **** { Read(); ! return _set.ExclusiveOr( a ); } --- 190,194 ---- { Read(); ! return internalSet.ExclusiveOr( a ); } *************** *** 196,200 **** { Read(); ! return _set.Intersect( a ); } --- 196,200 ---- { Read(); ! return internalSet.Intersect( a ); } *************** *** 204,208 **** { Read(); ! return _set.IsEmpty; } } --- 204,208 ---- { Read(); ! return internalSet.IsEmpty; } } *************** *** 211,215 **** { Read(); ! return _set.Minus( a ); } --- 211,215 ---- { Read(); ! return internalSet.Minus( a ); } *************** *** 217,221 **** { Write(); ! return _set.Remove( key ); } --- 217,221 ---- { Write(); ! return internalSet.Remove( key ); } *************** *** 223,227 **** { Write(); ! return _set.RemoveAll( c ); } --- 223,227 ---- { Write(); ! return internalSet.RemoveAll( c ); } *************** *** 229,233 **** { Write(); ! return _set.RetainAll( c ); } --- 229,233 ---- { Write(); ! return internalSet.RetainAll( c ); } *************** *** 235,259 **** { Read(); ! return _set.Union( a ); } #endregion - // /// <summary> - // /// <see cref="IDictionary.IsFixedSize"/> - // /// </summary> - // public bool IsFixedSize - // { - // get { return false; } - // } - // - // /// <summary> - // /// <see cref="IDictionary.IsReadOnly"/> - // /// </summary> - // public bool IsReadOnly - // { - // get { return false; } - // } - #region System.Collections.IEnumerable Members --- 235,243 ---- { Read(); ! return internalSet.Union( a ); } #endregion #region System.Collections.IEnumerable Members *************** *** 264,268 **** { Read(); ! return _set.GetEnumerator(); } --- 248,252 ---- { Read(); ! return internalSet.GetEnumerator(); } *************** *** 275,279 **** { Read(); ! return _set.Clone(); } --- 259,263 ---- { Read(); ! return internalSet.Clone(); } *************** *** 285,289 **** public override ICollection Elements() { ! return _set; } --- 269,273 ---- public override ICollection Elements() { ! return internalSet; } *************** *** 293,297 **** public override bool Empty { ! get { return _set.Count==0; } } --- 277,281 ---- public override bool Empty { ! get { return internalSet.Count==0; } } *************** *** 299,303 **** { Read(); ! return _set.ToString(); } --- 283,287 ---- { Read(); ! return internalSet.ToString(); } *************** *** 308,312 **** public override void WriteTo(IDbCommand st, CollectionPersister persister, object entry, int i, bool writeOrder) { ! persister.WriteElement(st, entry, writeOrder, session); } --- 292,296 ---- public override void WriteTo(IDbCommand st, CollectionPersister persister, object entry, int i, bool writeOrder) { ! persister.WriteElement( st, entry, writeOrder, session ); } *************** *** 342,346 **** { object element = persister.ElementType.ResolveIdentifier(identifier, session, owner); ! _set.Add( element ); } --- 326,330 ---- { object element = persister.ElementType.ResolveIdentifier(identifier, session, owner); ! internalSet.Add( element ); } *************** *** 352,356 **** public override ICollection Entries() { ! return _set; } --- 336,340 ---- public override ICollection Entries() { ! return internalSet; } *************** *** 361,368 **** public override object Disassemble(CollectionPersister persister) { ! object[] result = new object[ _set.Count ]; int i=0; ! foreach( object obj in _set ) { result[i++] = persister.ElementType.Disassemble( obj, session ); --- 345,352 ---- public override object Disassemble(CollectionPersister persister) { ! object[] result = new object[ internalSet.Count ]; int i=0; ! foreach( object obj in internalSet ) { result[i++] = persister.ElementType.Disassemble( obj, session ); *************** *** 383,387 **** object test = e.Key; ! if( _set.Contains( test )==false ) { deletes.Add( test ); --- 367,371 ---- object test = e.Key; ! if( internalSet.Contains( test )==false ) { deletes.Add( test ); *************** *** 390,394 **** } ! foreach(object obj in _set) { //object testKey = e.Key; --- 374,378 ---- } ! foreach(object obj in internalSet) { //object testKey = e.Key; |
|
From: Michael D. <mik...@us...> - 2004-11-21 22:58:35
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1408/Type Modified Files: CharBooleanType.cs NullableType.cs Log Message: NHibernate is now CLSCompliant Index: NullableType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/NullableType.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** NullableType.cs 20 Sep 2004 03:00:29 -0000 1.11 --- NullableType.cs 21 Nov 2004 22:56:31 -0000 1.12 *************** *** 20,28 **** private static readonly log4net.ILog log = log4net.LogManager.GetLogger( typeof(NullableType) ); ! /// <summary> ! /// The underlying <see cref="SqlType"/> used to retrieve and store the value. ! /// </summary> ! /// <value>The underlying <see cref="SqlType"/>.</value> ! protected SqlType sqlType; /// <summary> --- 20,24 ---- private static readonly log4net.ILog log = log4net.LogManager.GetLogger( typeof(NullableType) ); ! private SqlType _sqlType; /// <summary> *************** *** 34,38 **** protected NullableType(SqlType sqlType) { ! this.sqlType = sqlType; } --- 30,34 ---- protected NullableType(SqlType sqlType) { ! _sqlType = sqlType; } *************** *** 279,283 **** public virtual SqlType SqlType { ! get {return this.sqlType;} } --- 275,279 ---- public virtual SqlType SqlType { ! get {return _sqlType;} } Index: CharBooleanType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/CharBooleanType.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CharBooleanType.cs 25 Oct 2004 05:37:56 -0000 1.7 --- CharBooleanType.cs 21 Nov 2004 22:56:31 -0000 1.8 *************** *** 41,52 **** } ! public Object stringToObject(String xml) { ! if ( TrueString.Equals(xml) ) { return true; } ! else if ( FalseString.Equals(xml) ) { return false; } ! else { throw new HibernateException("Could not interpret: " + xml); } --- 41,56 ---- } ! public override object StringToObject(String xml) ! { ! if( TrueString.Equals(xml) ) ! { return true; } ! else if( FalseString.Equals(xml) ) ! { return false; } ! else ! { throw new HibernateException("Could not interpret: " + xml); } |
|
From: Michael D. <mik...@us...> - 2004-11-21 22:58:32
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1408 Modified Files: AssemblyInfo.cs NHibernate.build Log Message: NHibernate is now CLSCompliant Index: NHibernate.build =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate.build,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NHibernate.build 18 Nov 2004 02:48:38 -0000 1.4 --- NHibernate.build 21 Nov 2004 22:56:27 -0000 1.5 *************** *** 27,34 **** --- 27,36 ---- <asminfo output="AssemblyInfo.cs" language="CSharp"> <imports> + <import name="System" /> <import name="System.Reflection" /> <import name="System.Runtime.CompilerServices" /> </imports> <attributes> + <attribute type="CLSCompliantAttribute" value="true" /> <attribute type="AssemblyTitleAttribute" value="${nant.project.name} for ${current.runtime.description}" /> <attribute type="AssemblyDescriptionAttribute" value="An object persistence library for relational databases." /> Index: AssemblyInfo.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/AssemblyInfo.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** AssemblyInfo.cs 3 Nov 2004 02:23:16 -0000 1.11 --- AssemblyInfo.cs 21 Nov 2004 22:56:24 -0000 1.12 *************** *** 1,2 **** --- 1,3 ---- + using System; using System.Reflection; using System.Runtime.CompilerServices; *************** *** 12,15 **** --- 13,17 ---- //------------------------------------------------------------------------------ + [assembly: CLSCompliantAttribute(true)] [assembly: AssemblyTitleAttribute("NHibernate for Microsoft .NET Framework 1.1")] [assembly: AssemblyDescriptionAttribute("An object persistence library for relational databases.")] |
|
From: Michael D. <mik...@us...> - 2004-11-21 22:58:22
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1408/Hql Modified Files: FilterTranslator.cs PathExpressionParser.cs QueryTranslator.cs Log Message: NHibernate is now CLSCompliant Index: QueryTranslator.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/QueryTranslator.cs,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** QueryTranslator.cs 31 Oct 2004 04:30:59 -0000 1.47 --- QueryTranslator.cs 21 Nov 2004 22:56:28 -0000 1.48 *************** *** 69,73 **** private string queryString; private bool distinct = false; ! protected bool compiled; private SqlCommand.SqlString sqlString; private System.Type holderClass; --- 69,73 ---- private string queryString; private bool distinct = false; ! private bool compiled; //protected private SqlCommand.SqlString sqlString; private System.Type holderClass; *************** *** 117,121 **** public void Compile(ISessionFactoryImplementor factory, string queryString, IDictionary replacements, bool scalar) { ! if (!compiled) { this.factory = factory; --- 117,121 ---- public void Compile(ISessionFactoryImplementor factory, string queryString, IDictionary replacements, bool scalar) { ! if (!Compiled) { this.factory = factory; *************** *** 254,259 **** } ! public override SqlString SqlString { get { --- 254,260 ---- } ! protected internal override SqlString SqlString { + // this needs internal access because the WhereParser needs to be able to "get" it. get { *************** *** 261,264 **** --- 262,271 ---- return sqlString; } + set + { + throw new NotSupportedException( "SqlString can not be set by class outside of QueryTranslator" ); + //sqlString = value; } + } + } *************** *** 834,841 **** protected override string[] Suffixes { ! get ! { ! return suffixes; ! } } --- 841,846 ---- protected override string[] Suffixes { ! get { return suffixes; } ! set { suffixes = value; } } Index: PathExpressionParser.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/PathExpressionParser.cs,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** PathExpressionParser.cs 20 Aug 2004 17:39:02 -0000 1.17 --- PathExpressionParser.cs 21 Nov 2004 22:56:28 -0000 1.18 *************** *** 44,48 **** protected string[] columns; protected string[] collectionElementColumns; ! protected string collectionName; private string collectionOwnerName; private string collectionRole; --- 44,48 ---- protected string[] columns; protected string[] collectionElementColumns; ! private string collectionName; //protected private string collectionOwnerName; private string collectionRole; Index: FilterTranslator.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/FilterTranslator.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FilterTranslator.cs 30 Apr 2004 08:34:25 -0000 1.7 --- FilterTranslator.cs 21 Nov 2004 22:56:28 -0000 1.8 *************** *** 21,25 **** public void Compile(string collectionRole, ISessionFactoryImplementor factory, string queryString, IDictionary replacements, bool scalar) { ! if (!compiled) { this.factory = factory; // yick! --- 21,25 ---- public void Compile(string collectionRole, ISessionFactoryImplementor factory, string queryString, IDictionary replacements, bool scalar) { ! if (!Compiled) { this.factory = factory; // yick! |
|
From: Michael D. <mik...@us...> - 2004-11-21 22:58:10
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1408/Persister Modified Files: AbstractEntityPersister.cs EntityPersister.cs NormalizedEntityPersister.cs Log Message: NHibernate is now CLSCompliant Index: NormalizedEntityPersister.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/NormalizedEntityPersister.cs,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** NormalizedEntityPersister.cs 14 Oct 2004 04:33:14 -0000 1.33 --- NormalizedEntityPersister.cs 21 Nov 2004 22:56:29 -0000 1.34 *************** *** 162,166 **** this.factory = factory; Table table = model.RootTable; ! this.qualifiedTableName = table.GetQualifiedName( dialect, factory.DefaultSchema ); // DISCRIMINATOR --- 162,166 ---- this.factory = factory; Table table = model.RootTable; ! this.qualifiedTableName = table.GetQualifiedName( Dialect, factory.DefaultSchema ); // DISCRIMINATOR *************** *** 206,210 **** foreach(Table tab in model.TableClosureCollection) { ! string tabname = tab.GetQualifiedName( dialect, factory.DefaultSchema ); if ( !tabname.Equals(qualifiedTableName) ) { --- 206,210 ---- foreach(Table tab in model.TableClosureCollection) { ! string tabname = tab.GetQualifiedName( Dialect, factory.DefaultSchema ); if ( !tabname.Equals(qualifiedTableName) ) { *************** *** 214,218 **** foreach(Column col in tab.PrimaryKey.ColumnCollection ) { ! key[k++] = col.GetQuotedName(dialect); } keyColumns.Add(key); --- 214,218 ---- foreach(Column col in tab.PrimaryKey.ColumnCollection ) { ! key[k++] = col.GetQuotedName( Dialect ); } keyColumns.Add(key); *************** *** 235,239 **** foreach(Table tab in model.SubclassTableClosureCollection ) { ! string tabname = tab.GetQualifiedName(dialect, factory.DefaultSchema); if ( !tabname.Equals(qualifiedTableName) ) { subtables.Add(tabname); --- 235,239 ---- foreach(Table tab in model.SubclassTableClosureCollection ) { ! string tabname = tab.GetQualifiedName( Dialect, factory.DefaultSchema ); if ( !tabname.Equals(qualifiedTableName) ) { subtables.Add(tabname); *************** *** 242,246 **** foreach(Column col in tab.PrimaryKey.ColumnCollection ) { ! key[k++] = col.GetQuotedName(dialect); } keyColumns.Add(key); --- 242,246 ---- foreach(Column col in tab.PrimaryKey.ColumnCollection ) { ! key[k++] = col.GetQuotedName( Dialect ); } keyColumns.Add(key); *************** *** 282,286 **** thisClassProperties.Add(prop, thisClassPropertiesObject); Table tab = prop.Value.Table; ! string tabname = tab.GetQualifiedName(dialect, factory.DefaultSchema ); this.propertyTables[propertyIndex] = GetTableId(tabname, this.tableNames); --- 282,286 ---- thisClassProperties.Add(prop, thisClassPropertiesObject); Table tab = prop.Value.Table; ! string tabname = tab.GetQualifiedName( Dialect, factory.DefaultSchema ); this.propertyTables[propertyIndex] = GetTableId(tabname, this.tableNames); *************** *** 294,300 **** foreach(Column col in prop.ColumnCollection ) { ! string colname = col.GetQuotedName(dialect); propCols[columnIndex] = colname; ! propAliases[columnIndex] = col.Alias(dialect, tab.UniqueInteger.ToString() + StringHelper.Underscore); columnIndex++; } --- 294,300 ---- foreach(Column col in prop.ColumnCollection ) { ! string colname = col.GetQuotedName( Dialect ); propCols[columnIndex] = colname; ! propAliases[columnIndex] = col.Alias( Dialect, tab.UniqueInteger.ToString() + StringHelper.Underscore ); columnIndex++; } *************** *** 334,338 **** definedBySubclass.Add( !thisClassProperties.Contains(prop) ); Table tab = prop.Value.Table; ! string tabname = tab.GetQualifiedName( dialect, factory.DefaultSchema ); string[] cols = new string[ prop.ColumnSpan ]; types.Add( prop.Type ); --- 334,338 ---- definedBySubclass.Add( !thisClassProperties.Contains(prop) ); Table tab = prop.Value.Table; ! string tabname = tab.GetQualifiedName( Dialect, factory.DefaultSchema ); string[] cols = new string[ prop.ColumnSpan ]; types.Add( prop.Type ); *************** *** 343,350 **** foreach(Column col in prop.ColumnCollection) { ! columns.Add( col.GetQuotedName(dialect) ); coltables.Add(tabnum); ! cols[l++] = col.GetQuotedName(dialect); ! aliases.Add( col.Alias(dialect, tab.UniqueInteger.ToString() + StringHelper.Underscore ) ); } propColumns.Add(cols); --- 343,350 ---- foreach(Column col in prop.ColumnCollection) { ! columns.Add( col.GetQuotedName( Dialect ) ); coltables.Add(tabnum); ! cols[l++] = col.GetQuotedName( Dialect ); ! aliases.Add( col.Alias( Dialect, tab.UniqueInteger.ToString() + StringHelper.Underscore ) ); } propColumns.Add(cols); *************** *** 397,401 **** this.tableNumbers = new int[subclassSpan]; this.tableNumbers[subclassSpan-1] = GetTableId( ! model.Table.GetQualifiedName( dialect, factory.DefaultSchema ), this.subclassTableNameClosure); --- 397,401 ---- this.tableNumbers = new int[subclassSpan]; this.tableNumbers[subclassSpan-1] = GetTableId( ! model.Table.GetQualifiedName( Dialect, factory.DefaultSchema ), this.subclassTableNameClosure); *************** *** 403,407 **** foreach(Column col in model.Table.PrimaryKey.ColumnCollection) { ! notNullColumns[subclassSpan-1] = col.GetQuotedName(dialect); //only once } } --- 403,407 ---- foreach(Column col in model.Table.PrimaryKey.ColumnCollection) { ! notNullColumns[subclassSpan-1] = col.GetQuotedName( Dialect ); //only once } } *************** *** 425,434 **** discriminatorValues[p] = disc.ToString(); tableNumbers[p] = GetTableId( ! sc.Table.GetQualifiedName( dialect, factory.DefaultSchema ), subclassTableNameClosure ); foreach(Column col in sc.Table.PrimaryKey.ColumnCollection) { ! notNullColumns[p] = col.GetQuotedName(dialect); //only once; } } --- 425,434 ---- discriminatorValues[p] = disc.ToString(); tableNumbers[p] = GetTableId( ! sc.Table.GetQualifiedName( Dialect, factory.DefaultSchema ), subclassTableNameClosure ); foreach(Column col in sc.Table.PrimaryKey.ColumnCollection) { ! notNullColumns[p] = col.GetQuotedName( Dialect ); //only once; } } *************** *** 521,528 **** SqlString lockString = GenerateLockString(null, null); ! SqlString lockExclusiveString = dialect.SupportsForUpdate ? GenerateLockString(lockString, " FOR UPDATE") : GenerateLockString(lockString, null); ! SqlString lockExclusiveNowaitString = dialect.SupportsForUpdateNoWait ? GenerateLockString(lockString, " FOR UPDATE NOWAIT") : GenerateLockString(lockString, null); --- 521,528 ---- SqlString lockString = GenerateLockString(null, null); ! SqlString lockExclusiveString = Dialect.SupportsForUpdate ? GenerateLockString(lockString, " FOR UPDATE") : GenerateLockString(lockString, null); ! SqlString lockExclusiveNowaitString = Dialect.SupportsForUpdateNoWait ? GenerateLockString(lockString, " FOR UPDATE NOWAIT") : GenerateLockString(lockString, null); *************** *** 740,747 **** // make sure the Dialect has an identity insert string because we don't want // to add the column when there is no value to supply the SqlBuilder ! if(dialect.IdentityInsertString!=null) { // only 1 column if there is IdentityInsert enabled. ! builder.AddColumn(naturalOrderTableKeyColumns[j][0], dialect.IdentityInsertString); } } --- 740,747 ---- // make sure the Dialect has an identity insert string because we don't want // to add the column when there is no value to supply the SqlBuilder ! if( Dialect.IdentityInsertString!=null ) { // only 1 column if there is IdentityInsert enabled. ! builder.AddColumn( naturalOrderTableKeyColumns[j][0], Dialect.IdentityInsertString ); } } *************** *** 1088,1094 **** object id; ! if(dialect.SupportsIdentitySelectInInsert) { ! statement = session.Batcher.PrepareCommand( dialect.AddIdentitySelectToInsert(sql[0]) ); idSelect = statement; } --- 1088,1094 ---- object id; ! if( Dialect.SupportsIdentitySelectInInsert ) { ! statement = session.Batcher.PrepareCommand( Dialect.AddIdentitySelectToInsert( sql[0] ) ); idSelect = statement; } *************** *** 1115,1119 **** // if it doesn't support identity select in insert then we have to issue the Insert // as a seperate command here ! if(dialect.SupportsIdentitySelectInInsert==false) { session.Batcher.ExecuteNonQuery( statement ); --- 1115,1119 ---- // if it doesn't support identity select in insert then we have to issue the Insert // as a seperate command here ! if( Dialect.SupportsIdentitySelectInInsert==false ) { session.Batcher.ExecuteNonQuery( statement ); *************** *** 1137,1141 **** finally { ! if( dialect.SupportsIdentitySelectInInsert==false ) { session.Batcher.CloseCommand( statement, null ); --- 1137,1141 ---- finally { ! if( Dialect.SupportsIdentitySelectInInsert==false ) { session.Batcher.CloseCommand( statement, null ); *************** *** 1340,1344 **** string idProp = IdentifierPropertyName; if (idProp!=null) InitPropertyPaths( idProp, IdentifierType, IdentifierColumnNames, 0, mapping ); ! if ( hasEmbeddedIdentifier ) InitPropertyPaths( null, IdentifierType, IdentifierColumnNames, 0, mapping ); InitPropertyPaths( PathExpressionParser.EntityID, IdentifierType, IdentifierColumnNames, 0, mapping ); --- 1340,1344 ---- string idProp = IdentifierPropertyName; if (idProp!=null) InitPropertyPaths( idProp, IdentifierType, IdentifierColumnNames, 0, mapping ); ! if ( HasEmbeddedIdentifier ) InitPropertyPaths( null, IdentifierType, IdentifierColumnNames, 0, mapping ); InitPropertyPaths( PathExpressionParser.EntityID, IdentifierType, IdentifierColumnNames, 0, mapping ); *************** *** 1511,1515 **** private CaseFragment DiscriminatorFragment(string alias) { ! CaseFragment cases = dialect.CreateCaseFragment(); for (int i=0; i<discriminatorValues.Length; i++) --- 1511,1515 ---- private CaseFragment DiscriminatorFragment(string alias) { ! CaseFragment cases = Dialect.CreateCaseFragment(); for (int i=0; i<discriminatorValues.Length; i++) *************** *** 1527,1531 **** { if (tableNumber==0) return name; ! return dialect.QuoteForAliasName(dialect.UnQuote(name) + StringHelper.Underscore + tableNumber); } --- 1527,1531 ---- { if (tableNumber==0) return name; ! return Dialect.QuoteForAliasName( Dialect.UnQuote(name) + StringHelper.Underscore + tableNumber ); } Index: AbstractEntityPersister.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/AbstractEntityPersister.cs,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** AbstractEntityPersister.cs 21 Sep 2004 09:58:24 -0000 1.26 --- AbstractEntityPersister.cs 21 Nov 2004 22:56:29 -0000 1.27 *************** *** 33,37 **** private System.Type mappedClass; ! [NonSerialized] protected Dialect.Dialect dialect; [NonSerialized] private ConstructorInfo constructor; --- 33,37 ---- private System.Type mappedClass; ! [NonSerialized] private Dialect.Dialect dialect; [NonSerialized] private ConstructorInfo constructor; *************** *** 60,64 **** [NonSerialized] private System.Type concreteProxyClass; [NonSerialized] private bool hasProxy; ! [NonSerialized] protected bool hasEmbeddedIdentifier; [NonSerialized] private string[] identifierColumnNames; --- 60,64 ---- [NonSerialized] private System.Type concreteProxyClass; [NonSerialized] private bool hasProxy; ! [NonSerialized] private bool hasEmbeddedIdentifier; [NonSerialized] private string[] identifierColumnNames; *************** *** 111,115 **** public virtual SqlString IdentifierSelectFragment(string name, string suffix) { ! return new SelectFragment(dialect) .SetSuffix(suffix) .AddColumns( name, IdentifierColumnNames ) --- 111,115 ---- public virtual SqlString IdentifierSelectFragment(string name, string suffix) { ! return new SelectFragment( Dialect ) .SetSuffix(suffix) .AddColumns( name, IdentifierColumnNames ) *************** *** 189,193 **** { object id; ! if (hasEmbeddedIdentifier) { id = obj; --- 189,193 ---- { object id; ! if ( HasEmbeddedIdentifier ) { id = obj; *************** *** 209,213 **** public virtual void SetIdentifier(object obj, object id) { ! if(hasEmbeddedIdentifier) { ComponentType copier = (ComponentType) identifierType; --- 209,213 ---- public virtual void SetIdentifier(object obj, object id) { ! if( HasEmbeddedIdentifier ) { ComponentType copier = (ComponentType) identifierType; *************** *** 227,231 **** public virtual object Instantiate(object id) { ! if (hasEmbeddedIdentifier && id.GetType()==mappedClass) { return id; --- 227,231 ---- public virtual object Instantiate(object id) { ! if ( HasEmbeddedIdentifier && id.GetType()==mappedClass ) { return id; *************** *** 427,431 **** protected AbstractEntityPersister(PersistentClass model, ISessionFactoryImplementor factory) { ! this.dialect = factory.Dialect; // CLASS --- 427,431 ---- protected AbstractEntityPersister(PersistentClass model, ISessionFactoryImplementor factory) { ! dialect = factory.Dialect; // CLASS *************** *** 441,445 **** sqlWhereStringTemplate = sqlWhereString==null ? null : ! Template.RenderWhereStringTemplate(sqlWhereString, dialect); polymorphic = model.IsPolymorphic; --- 441,445 ---- sqlWhereStringTemplate = sqlWhereString==null ? null : ! Template.RenderWhereStringTemplate(sqlWhereString, Dialect); polymorphic = model.IsPolymorphic; *************** *** 513,524 **** foreach(Column col in idValue.ColumnCollection) { ! identifierColumnNames[i] = col.GetQuotedName(dialect); i++; } // GENERATOR ! idgen = model.Identifier.CreateIdentifierGenerator(dialect); useIdentityColumn = idgen is IdentityGenerator; ! identitySelectString = useIdentityColumn ? dialect.IdentitySelectString : null; // UNSAVED-VALUE: --- 513,524 ---- foreach(Column col in idValue.ColumnCollection) { ! identifierColumnNames[i] = col.GetQuotedName( Dialect ); i++; } // GENERATOR ! idgen = model.Identifier.CreateIdentifierGenerator( Dialect ); useIdentityColumn = idgen is IdentityGenerator; ! identitySelectString = useIdentityColumn ? Dialect.IdentitySelectString : null; // UNSAVED-VALUE: *************** *** 559,563 **** foreach(Column col in model.Version.ColumnCollection) { ! versionColumnName = col.GetQuotedName(dialect); //only hapens once } } --- 559,563 ---- foreach(Column col in model.Version.ColumnCollection) { ! versionColumnName = col.GetQuotedName( Dialect ); //only hapens once } } *************** *** 786,790 **** public virtual bool HasIdentifierPropertyOrEmbeddedCompositeIdentifier { ! get { return HasIdentifierProperty || hasEmbeddedIdentifier;} } --- 786,790 ---- public virtual bool HasIdentifierPropertyOrEmbeddedCompositeIdentifier { ! get { return HasIdentifierProperty || HasEmbeddedIdentifier; } } Index: EntityPersister.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/EntityPersister.cs,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** EntityPersister.cs 21 Sep 2004 09:58:24 -0000 1.30 --- EntityPersister.cs 21 Nov 2004 22:56:29 -0000 1.31 *************** *** 80,84 **** this.factory = factory; Table table = model.RootTable; ! qualifiedTableName = table.GetQualifiedName( dialect, factory.DefaultSchema ); tableNames = new string[] { qualifiedTableName }; --- 80,84 ---- this.factory = factory; Table table = model.RootTable; ! qualifiedTableName = table.GetQualifiedName( Dialect, factory.DefaultSchema ); tableNames = new string[] { qualifiedTableName }; *************** *** 100,104 **** foreach(Column discColumn in d.ColumnCollection) { ! discriminatorColumnName = discColumn.GetQuotedName(dialect); } --- 100,104 ---- foreach(Column discColumn in d.ColumnCollection) { ! discriminatorColumnName = discColumn.GetQuotedName( Dialect ); } *************** *** 163,168 **** foreach(Column col in prop.ColumnCollection) { ! colAliases[j] = col.Alias(dialect); ! colNames[j] = col.GetQuotedName(dialect); j++; if( prop.IsUpdateable ) foundColumn=true; --- 163,168 ---- foreach(Column col in prop.ColumnCollection) { ! colAliases[j] = col.Alias( Dialect ); ! colNames[j] = col.GetQuotedName( Dialect ); j++; if( prop.IsUpdateable ) foundColumn=true; *************** *** 201,205 **** { formulas.Add( prop.Formula.FormulaString ); ! formulaTemplates.Add( prop.Formula.GetTemplate(dialect) ); propColumns.Add( new string[0] ); formulaAliases.Add( prop.Formula.Alias ); --- 201,205 ---- { formulas.Add( prop.Formula.FormulaString ); ! formulaTemplates.Add( prop.Formula.GetTemplate( Dialect ) ); propColumns.Add( new string[0] ); formulaAliases.Add( prop.Formula.Alias ); *************** *** 213,219 **** foreach( Column col in prop.ColumnCollection ) { ! columns.Add( col.GetQuotedName(dialect) ); ! aliases.Add( col.Alias(dialect) ); ! cols[l++] = col.GetQuotedName(dialect); } propColumns.Add(cols); --- 213,219 ---- foreach( Column col in prop.ColumnCollection ) { ! columns.Add( col.GetQuotedName( Dialect ) ); ! aliases.Add( col.Alias( Dialect ) ); ! cols[l++] = col.GetQuotedName( Dialect ); } propColumns.Add(cols); *************** *** 354,361 **** SqlString lockString = GenerateLockString(null, null); ! SqlString lockExclusiveString = dialect.SupportsForUpdate ? GenerateLockString(lockString, " FOR UPDATE") : GenerateLockString(lockString, null); ! SqlString lockExclusiveNowaitString = dialect.SupportsForUpdateNoWait ? GenerateLockString(lockString, " FOR UPDATE NOWAIT") : GenerateLockString(lockString, null); --- 354,361 ---- SqlString lockString = GenerateLockString(null, null); ! SqlString lockExclusiveString = Dialect.SupportsForUpdate ? GenerateLockString(lockString, " FOR UPDATE") : GenerateLockString(lockString, null); ! SqlString lockExclusiveNowaitString = Dialect.SupportsForUpdateNoWait ? GenerateLockString(lockString, " FOR UPDATE NOWAIT") : GenerateLockString(lockString, null); *************** *** 532,539 **** // make sure the Dialect has an identity insert string because we don't want // to add the column when there is no value to supply the SqlBuilder ! if(dialect.IdentityInsertString!=null) { // only 1 column if there is IdentityInsert enabled. ! builder.AddColumn(IdentifierColumnNames[0], dialect.IdentityInsertString); } } --- 532,539 ---- // make sure the Dialect has an identity insert string because we don't want // to add the column when there is no value to supply the SqlBuilder ! if( Dialect.IdentityInsertString!=null ) { // only 1 column if there is IdentityInsert enabled. ! builder.AddColumn( IdentifierColumnNames[0], Dialect.IdentityInsertString ); } } *************** *** 832,838 **** IDataReader rs = null; ! if(dialect.SupportsIdentitySelectInInsert) { ! statement = session.Batcher.PrepareCommand( dialect.AddIdentitySelectToInsert(sql) ); idSelect = statement; } --- 832,838 ---- IDataReader rs = null; ! if( Dialect.SupportsIdentitySelectInInsert ) { ! statement = session.Batcher.PrepareCommand( Dialect.AddIdentitySelectToInsert(sql) ); idSelect = statement; } *************** *** 859,863 **** // if it doesn't support identity select in insert then we have to issue the Insert // as a seperate command here ! if(dialect.SupportsIdentitySelectInInsert==false) { session.Batcher.ExecuteNonQuery( statement ); --- 859,863 ---- // if it doesn't support identity select in insert then we have to issue the Insert // as a seperate command here ! if( Dialect.SupportsIdentitySelectInInsert==false ) { session.Batcher.ExecuteNonQuery( statement ); *************** *** 884,888 **** finally { ! if( dialect.SupportsIdentitySelectInInsert==false ) { session.Batcher.CloseCommand( statement, null ); --- 884,888 ---- finally { ! if( Dialect.SupportsIdentitySelectInInsert==false ) { session.Batcher.CloseCommand( statement, null ); *************** *** 1069,1073 **** string idProp = IdentifierPropertyName; if (idProp!=null) InitPropertyPaths( idProp, IdentifierType, IdentifierColumnNames, mapping ); ! if ( hasEmbeddedIdentifier ) InitPropertyPaths( null, IdentifierType, IdentifierColumnNames, mapping ); InitPropertyPaths( PathExpressionParser.EntityID, IdentifierType, IdentifierColumnNames, mapping ); --- 1069,1073 ---- string idProp = IdentifierPropertyName; if (idProp!=null) InitPropertyPaths( idProp, IdentifierType, IdentifierColumnNames, mapping ); ! if ( HasEmbeddedIdentifier ) InitPropertyPaths( null, IdentifierType, IdentifierColumnNames, mapping ); InitPropertyPaths( PathExpressionParser.EntityID, IdentifierType, IdentifierColumnNames, mapping ); |
|
From: Michael D. <mik...@us...> - 2004-11-21 22:57:59
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlTypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1408/SqlTypes Modified Files: SqlType.cs Log Message: NHibernate is now CLSCompliant Index: SqlType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlTypes/SqlType.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SqlType.cs 9 Aug 2004 03:33:54 -0000 1.3 --- SqlType.cs 21 Nov 2004 22:56:30 -0000 1.4 *************** *** 15,74 **** public abstract class SqlType { ! protected DbType dbType; ! protected int length; ! protected byte precision; ! protected byte scale; ! protected bool lengthDefined = false; ! protected bool precisionDefined = false; protected SqlType(DbType dbType) { ! this.dbType = dbType; } protected SqlType(DbType dbType, int length) { ! this.dbType = dbType; ! this.length = length; ! this.lengthDefined = true; } protected SqlType(DbType dbType, byte precision, byte scale) { ! this.dbType = dbType; ! this.precision = precision; ! this.scale = scale; ! this.precisionDefined = true; } public DbType DbType { ! get { return dbType;} } public int Length { ! get { return length;} } public byte Precision { ! get { return precision;} } public byte Scale { ! get { return scale;} } public bool LengthDefined { ! get { return lengthDefined;} } public bool PrecisionDefined { ! get { return precisionDefined;} } --- 15,74 ---- public abstract class SqlType { ! private DbType _dbType; ! private int _length; ! private byte _precision; ! private byte _scale; ! private bool _lengthDefined = false; ! private bool _precisionDefined = false; protected SqlType(DbType dbType) { ! _dbType = dbType; } protected SqlType(DbType dbType, int length) { ! _dbType = dbType; ! _length = length; ! _lengthDefined = true; } protected SqlType(DbType dbType, byte precision, byte scale) { ! _dbType = dbType; ! _precision = precision; ! _scale = scale; ! _precisionDefined = true; } public DbType DbType { ! get { return _dbType;} } public int Length { ! get { return _length;} } public byte Precision { ! get { return _precision;} } public byte Scale { ! get { return _scale;} } public bool LengthDefined { ! get { return _lengthDefined;} } public bool PrecisionDefined { ! get { return _precisionDefined;} } *************** *** 79,93 **** int hashCode = 0; ! if(lengthDefined) { ! hashCode = (dbType.GetHashCode()/2) + (length.GetHashCode()/2); } ! else if(precisionDefined) { ! hashCode = (dbType.GetHashCode()/3) + (precision.GetHashCode()/3) + (scale.GetHashCode()/3); } else { ! hashCode = dbType.GetHashCode(); } --- 79,93 ---- int hashCode = 0; ! if( LengthDefined ) { ! hashCode = ( DbType.GetHashCode()/2 ) + ( Length.GetHashCode()/2 ); } ! else if( PrecisionDefined) { ! hashCode = ( DbType.GetHashCode()/3 ) + ( Precision.GetHashCode()/3 ) + ( Scale.GetHashCode()/3 ); } else { ! hashCode = DbType.GetHashCode(); } *************** *** 101,126 **** // Step1: Perform an equals test ! if(obj==this) return true; // Step 2: Instance of check rhsSqlType = obj as SqlType; ! if(rhsSqlType==null) return false; //Step 3: Check each important field ! if(lengthDefined) { ! equals = (dbType.Equals(rhsSqlType.DbType)) ! && (length==rhsSqlType.Length); } ! else if (precisionDefined) { ! equals = (dbType.Equals(rhsSqlType.DbType)) ! && (precision==rhsSqlType.Precision) ! && (scale==rhsSqlType.Scale); } else { ! equals = (dbType.Equals(rhsSqlType.DbType)); } --- 101,126 ---- // Step1: Perform an equals test ! if( obj==this ) return true; // Step 2: Instance of check rhsSqlType = obj as SqlType; ! if( rhsSqlType==null ) return false; //Step 3: Check each important field ! if( LengthDefined ) { ! equals = ( DbType.Equals( rhsSqlType.DbType ) ) ! && ( Length==rhsSqlType.Length ); } ! else if( PrecisionDefined ) { ! equals = ( DbType.Equals( rhsSqlType.DbType ) ) ! && ( Precision==rhsSqlType.Precision ) ! && ( Scale==rhsSqlType.Scale ); } else { ! equals = ( DbType.Equals( rhsSqlType.DbType ) ); } |
|
From: Michael D. <mik...@us...> - 2004-11-21 22:57:55
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1408/Loader Modified Files: AbstractEntityLoader.cs CollectionLoader.cs CriteriaLoader.cs EntityLoader.cs Loader.cs OneToManyLoader.cs OuterJoinLoader.cs SimpleEntityLoader.cs Log Message: NHibernate is now CLSCompliant Index: AbstractEntityLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/AbstractEntityLoader.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AbstractEntityLoader.cs 28 Aug 2004 05:26:36 -0000 1.10 --- AbstractEntityLoader.cs 21 Nov 2004 22:56:29 -0000 1.11 *************** *** 14,23 **** { protected ILoadable persister; ! protected string alias; public AbstractEntityLoader(ILoadable persister, ISessionFactoryImplementor factory) : base(factory.Dialect) { this.persister = persister; ! alias = Alias(persister.ClassName, 0); } --- 14,28 ---- { protected ILoadable persister; ! private string alias; public AbstractEntityLoader(ILoadable persister, ISessionFactoryImplementor factory) : base(factory.Dialect) { this.persister = persister; ! alias = ToAlias(persister.ClassName, 0); ! } ! ! protected string Alias ! { ! get { return alias; } } *************** *** 32,37 **** int joins=associations.Count; ! suffixes = new string[joins+1]; ! for (int i=0; i<=joins; i++) suffixes[i] = (joins==0) ? String.Empty : i.ToString() + StringHelper.Underscore; JoinFragment ojf = OuterJoins(associations); --- 37,42 ---- int joins=associations.Count; ! Suffixes = new string[joins+1]; ! for (int i=0; i<=joins; i++) Suffixes[i] = (joins==0) ? String.Empty : i.ToString() + StringHelper.Underscore; JoinFragment ojf = OuterJoins(associations); *************** *** 39,43 **** selectBuilder.SetSelectClause( (joins==0 ? String.Empty : SelectString(associations) + ",") + ! SelectString(persister, alias, suffixes[joins] ) ) .SetFromClause --- 44,48 ---- selectBuilder.SetSelectClause( (joins==0 ? String.Empty : SelectString(associations) + ",") + ! SelectString(persister, alias, Suffixes[joins] ) ) .SetFromClause *************** *** 77,87 **** int joins=associations.Count; ! suffixes = new string[joins+1]; ! for (int i=0; i<=joins; i++) suffixes[i] = (joins==0) ? String.Empty : i.ToString() + StringHelper.Underscore; JoinFragment ojf = OuterJoins(associations); sqlBuilder.SetSelectClause( (joins==0 ? String.Empty : SelectString(associations) + ",") + ! SelectString(persister, alias, suffixes[joins] ) ); --- 82,92 ---- int joins=associations.Count; ! Suffixes = new string[joins+1]; ! for (int i=0; i<=joins; i++) Suffixes[i] = (joins==0) ? String.Empty : i.ToString() + StringHelper.Underscore; JoinFragment ojf = OuterJoins(associations); sqlBuilder.SetSelectClause( (joins==0 ? String.Empty : SelectString(associations) + ",") + ! SelectString(persister, alias, Suffixes[joins] ) ); *************** *** 105,109 **** sqlBuilder.SetOrderByClause(orderBy); ! this.sqlString = sqlBuilder.ToSqlString(); classPersisters = new ILoadable[joins+1]; --- 110,114 ---- sqlBuilder.SetOrderByClause(orderBy); ! this.SqlString = sqlBuilder.ToSqlString(); classPersisters = new ILoadable[joins+1]; Index: SimpleEntityLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/SimpleEntityLoader.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SimpleEntityLoader.cs 30 Apr 2004 14:06:47 -0000 1.7 --- SimpleEntityLoader.cs 21 Nov 2004 22:56:29 -0000 1.8 *************** *** 34,40 **** } ! public override SqlString SqlString { ! get {return sqlString;} } --- 34,41 ---- } ! protected internal override SqlString SqlString { ! get { return sqlString; } ! set { sqlString = value; } } *************** *** 50,53 **** --- 51,55 ---- { get { return NoSuffix; } + set { throw new NotSupportedException( "A SimpleEntityLoader has no Suffixes" ); } } Index: OneToManyLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OneToManyLoader.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** OneToManyLoader.cs 28 Aug 2004 05:26:36 -0000 1.10 --- OneToManyLoader.cs 21 Nov 2004 22:56:29 -0000 1.11 *************** *** 36,40 **** ((EntityType) collPersister.ElementType).PersistentClass); ! string alias = Alias(collectionPersister.QualifiedTableName, 0); SqlString whereSqlString = null; --- 36,40 ---- ((EntityType) collPersister.ElementType).PersistentClass); ! string alias = ToAlias(collectionPersister.QualifiedTableName, 0); SqlString whereSqlString = null; *************** *** 46,51 **** int joins=associations.Count; ! suffixes = new string[joins+1]; ! for (int i=0; i<=joins; i++) suffixes[i] = (joins==0) ? String.Empty : i.ToString() + StringHelper.Underscore; --- 46,51 ---- int joins=associations.Count; ! Suffixes = new string[joins+1]; ! for (int i=0; i<=joins; i++) Suffixes[i] = (joins==0) ? String.Empty : i.ToString() + StringHelper.Underscore; *************** *** 58,62 **** (joins==0 ? String.Empty : "," + SelectString(associations) ) + ", " + ! SelectString( persister, alias, suffixes[joins] ) ); --- 58,62 ---- (joins==0 ? String.Empty : "," + SelectString(associations) ) + ", " + ! SelectString( persister, alias, Suffixes[joins] ) ); *************** *** 80,84 **** if(collectionPersister.HasOrdering) selectBuilder.SetOrderByClause( collectionPersister.GetSQLOrderByString(alias) ); ! this.sqlString = selectBuilder.ToSqlString(); --- 80,84 ---- if(collectionPersister.HasOrdering) selectBuilder.SetOrderByClause( collectionPersister.GetSQLOrderByString(alias) ); ! this.SqlString = selectBuilder.ToSqlString(); Index: CollectionLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/CollectionLoader.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CollectionLoader.cs 20 Aug 2004 17:39:02 -0000 1.9 --- CollectionLoader.cs 21 Nov 2004 22:56:29 -0000 1.10 *************** *** 24,28 **** idType = persister.KeyType; ! string alias = Alias( persister.QualifiedTableName, 0); //TODO: H2.0.3 the whereString is appended with the " and " - I don't think --- 24,28 ---- idType = persister.KeyType; ! string alias = ToAlias( persister.QualifiedTableName, 0); //TODO: H2.0.3 the whereString is appended with the " and " - I don't think *************** *** 36,41 **** int joins = associations.Count; ! suffixes = new string[joins]; ! for (int i=0; i<joins; i++) suffixes[i] = i.ToString() + StringHelper.Underscore; JoinFragment ojf = OuterJoins(associations); --- 36,41 ---- int joins = associations.Count; ! Suffixes = new string[joins]; ! for (int i=0; i<joins; i++) Suffixes[i] = i.ToString() + StringHelper.Underscore; JoinFragment ojf = OuterJoins(associations); *************** *** 54,58 **** if(persister.HasOrdering) selectBuilder.SetOrderByClause(persister.GetSQLOrderByString(alias)); ! this.sqlString = selectBuilder.ToSqlString(); classPersisters = new ILoadable[joins]; --- 54,58 ---- if(persister.HasOrdering) selectBuilder.SetOrderByClause(persister.GetSQLOrderByString(alias)); ! this.SqlString = selectBuilder.ToSqlString(); classPersisters = new ILoadable[joins]; Index: OuterJoinLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OuterJoinLoader.cs,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** OuterJoinLoader.cs 28 Aug 2004 05:26:36 -0000 1.14 --- OuterJoinLoader.cs 21 Nov 2004 22:56:29 -0000 1.15 *************** *** 32,37 **** protected LockMode[] lockModeArray; ! protected SqlString sqlString; ! protected string[] suffixes; --- 32,37 ---- protected LockMode[] lockModeArray; ! private SqlString sqlString; ! private string[] suffixes; *************** *** 136,140 **** assoc.Subpersister = subpersister; assoc.ForeignKeyColumns = columns; ! string subalias = Alias(subpersister.ClassName, associations.Count); assoc.Subalias = subalias; --- 136,140 ---- assoc.Subpersister = subpersister; assoc.ForeignKeyColumns = columns; ! string subalias = ToAlias(subpersister.ClassName, associations.Count); assoc.Subalias = subalias; *************** *** 374,383 **** } ! public override SqlString SqlString { ! get { return sqlString;} } - public override ILoadable[] Persisters { --- 374,383 ---- } ! protected internal override SqlString SqlString { ! get { return sqlString; } ! set { sqlString = value; } } public override ILoadable[] Persisters { *************** *** 433,444 **** { get { return suffixes; } } ! protected string Alias(string tableName, int n) { ! tableName = StringHelper.Unqualify(tableName); //TODO: this is broken if we have quoted identifier with a "." //TODO: H2.0.3 - changes tableName to lower case - don't know why it is needed... ! return (new Alias(10, n.ToString() + StringHelper.Underscore)).ToAliasString(tableName, dialect); } --- 433,449 ---- { get { return suffixes; } + set { suffixes = value; } } ! protected string ToAlias(string tableName, int n) { ! // H2.0.3 - was called Alias, but changed it to ToAlias because I wanted to have ! // a protected property named Alias ! ! //TODO: this is broken if we have quoted identifier with a "." ! tableName = StringHelper.Unqualify(tableName); //TODO: H2.0.3 - changes tableName to lower case - don't know why it is needed... ! return ( new Alias(10, n.ToString() + StringHelper.Underscore) ).ToAliasString( tableName, dialect ); } Index: EntityLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/EntityLoader.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EntityLoader.cs 20 Aug 2004 17:39:02 -0000 1.5 --- EntityLoader.cs 21 Nov 2004 22:56:29 -0000 1.6 *************** *** 24,31 **** SqlSelectBuilder selectBuilder = new SqlSelectBuilder(factory); ! selectBuilder.SetWhereClause(alias, persister.IdentifierColumnNames, persister.IdentifierType); RenderStatement(selectBuilder, factory); ! this.sqlString = selectBuilder.ToSqlString(); PostInstantiate(); --- 24,31 ---- SqlSelectBuilder selectBuilder = new SqlSelectBuilder(factory); ! selectBuilder.SetWhereClause( Alias, persister.IdentifierColumnNames, persister.IdentifierType ); RenderStatement(selectBuilder, factory); ! this.SqlString = selectBuilder.ToSqlString(); PostInstantiate(); Index: Loader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/Loader.cs,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Loader.cs 8 Nov 2004 02:53:55 -0000 1.39 --- Loader.cs 21 Nov 2004 22:56:29 -0000 1.40 *************** *** 35,39 **** /// The SqlString to be called; implemented by all subclasses /// </summary> ! public abstract SqlString SqlString {get;} /// <summary> --- 35,40 ---- /// The SqlString to be called; implemented by all subclasses /// </summary> ! /// <remarks>TODO: add something about internal</remarks> ! protected internal abstract SqlString SqlString {get; set;} /// <summary> *************** *** 47,51 **** /// implemented by all subclasses /// </summary> ! protected abstract string[] Suffixes { get; } /// <summary> --- 48,53 ---- /// implemented by all subclasses /// </summary> ! /// added set ! protected abstract string[] Suffixes { get; set; } /// <summary> *************** *** 540,551 **** } - // [Obsolete("use QueryParameters instead.")] - // protected virtual IDbCommand PrepareCommand(SqlString sqlString, object[] values, IType[] types, IDictionary namedParams, RowSelection selection, bool scroll, ISessionImplementor session) - // { - // QueryParameters qp = new QueryParameters( types, values, namedParams, null, selection ); - // return PrepareCommand( sqlString, qp, scroll, session ); - // - // } - /// <summary> /// Creates an IDbCommand object and populates it with the values necessary to execute it against the --- 542,545 ---- Index: CriteriaLoader.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/CriteriaLoader.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CriteriaLoader.cs 31 Oct 2004 04:31:00 -0000 1.9 --- CriteriaLoader.cs 21 Nov 2004 22:56:29 -0000 1.10 *************** *** 44,51 **** commaNeeded = true; ! orderByBuilder.Append(ord.ToStringForSql(factory, criteria.PersistentClass, alias)); } ! RenderStatement(criteria.Expression.ToSqlString(factory, criteria.PersistentClass, alias), orderByBuilder.ToString(), factory); PostInstantiate(); --- 44,51 ---- commaNeeded = true; ! orderByBuilder.Append(ord.ToStringForSql(factory, criteria.PersistentClass, Alias)); } ! RenderStatement(criteria.Expression.ToSqlString(factory, criteria.PersistentClass, Alias), orderByBuilder.ToString(), factory); PostInstantiate(); |
|
From: Michael D. <mik...@us...> - 2004-11-21 22:56:57
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1107/NHibernate.Test Modified Files: NHibernate.Test-1.1.csproj Log Message: Added test for all the Types implementing IVersionType Index: NHibernate.Test-1.1.csproj =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test-1.1.csproj,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** NHibernate.Test-1.1.csproj 18 Nov 2004 02:46:59 -0000 1.50 --- NHibernate.Test-1.1.csproj 21 Nov 2004 22:54:56 -0000 1.51 *************** *** 531,534 **** --- 531,549 ---- /> <File + RelPath = "TypesTest\Int16TypeFixture.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "TypesTest\Int32TypeFixture.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "TypesTest\Int64TypeFixture.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "TypesTest\PersistentEnumTypeFixture.cs" SubType = "Code" *************** *** 536,539 **** --- 551,569 ---- /> <File + RelPath = "TypesTest\TicksTypeFixture.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "TypesTest\TimeSpanTypeFixture.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "TypesTest\TimestampTypeFixture.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "TypesTest\TypeFactoryFixture.cs" SubType = "Code" |
1279 messages has been excluded from this view by a project administrator.
