From: Michael D. <mik...@us...> - 2004-08-16 05:21:21
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Driver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32315/Driver Modified Files: DriverBase.cs IDriver.cs SqlClientDriver.cs Log Message: Tidied up references to SqlCommand.* to not fully specify SqlCommand since all uses of Sql namespace have been removed from Dialect & Driver. Modified MsSql dialect because SqlString can now have a string appended instead of needing a full SqlString. Index: DriverBase.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Driver/DriverBase.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DriverBase.cs 19 Jul 2004 03:20:25 -0000 1.6 --- DriverBase.cs 16 Aug 2004 05:21:12 -0000 1.7 *************** *** 1,5 **** --- 1,7 ---- using System; using System.Data; + using System.Text; + using NHibernate.SqlCommand; using NHibernate.Util; *************** *** 86,99 **** } ! public virtual IDbCommand GenerateCommand(Dialect.Dialect dialect, SqlCommand.SqlString sqlString) { int paramIndex = 0; IDbCommand cmd = this.CreateCommand(); ! System.Text.StringBuilder builder = new System.Text.StringBuilder(sqlString.SqlParts.Length * 15); for(int i = 0; i < sqlString.SqlParts.Length; i++) { object part = sqlString.SqlParts[i]; ! SqlCommand.Parameter parameter = part as SqlCommand.Parameter; if(parameter!=null) --- 88,101 ---- } ! public virtual IDbCommand GenerateCommand(Dialect.Dialect dialect, SqlString sqlString) { int paramIndex = 0; IDbCommand cmd = this.CreateCommand(); ! StringBuilder builder = new StringBuilder(sqlString.SqlParts.Length * 15); for(int i = 0; i < sqlString.SqlParts.Length; i++) { object part = sqlString.SqlParts[i]; ! Parameter parameter = part as Parameter; if(parameter!=null) *************** *** 141,145 **** /// those values are not set, only the DbType and ParameterName are set. /// </remarks> ! protected virtual IDbDataParameter GenerateParameter(IDbCommand command, string name, SqlCommand.Parameter parameter, Dialect.Dialect dialect) { IDbDataParameter dbParam = command.CreateParameter(); --- 143,147 ---- /// those values are not set, only the DbType and ParameterName are set. /// </remarks> ! protected virtual IDbDataParameter GenerateParameter(IDbCommand command, string name, Parameter parameter, Dialect.Dialect dialect) { IDbDataParameter dbParam = command.CreateParameter(); Index: SqlClientDriver.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Driver/SqlClientDriver.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SqlClientDriver.cs 19 Jul 2004 03:20:25 -0000 1.4 --- SqlClientDriver.cs 16 Aug 2004 05:21:12 -0000 1.5 *************** *** 2,5 **** --- 2,7 ---- using System.Data; + using NHibernate.SqlCommand; + namespace NHibernate.Driver { *************** *** 76,80 **** /// to be set. /// </remarks> ! protected override IDbDataParameter GenerateParameter(IDbCommand command, string name, SqlCommand.Parameter parameter, Dialect.Dialect dialect) { IDbDataParameter dbParam = base.GenerateParameter(command, name, parameter, dialect); --- 78,82 ---- /// to be set. /// </remarks> ! protected override IDbDataParameter GenerateParameter(IDbCommand command, string name, Parameter parameter, Dialect.Dialect dialect) { IDbDataParameter dbParam = base.GenerateParameter(command, name, parameter, dialect); *************** *** 85,90 **** // if this parameter needs to have a value set for the Size or Precision/Scale besides the default // value of the Dialect then one of these will not be null ! SqlCommand.ParameterLength pl = null; ! SqlCommand.ParameterPrecisionScale pps = null; switch( parameter.SqlType.DbType ) --- 87,92 ---- // if this parameter needs to have a value set for the Size or Precision/Scale besides the default // value of the Dialect then one of these will not be null ! ParameterLength pl = null; ! ParameterPrecisionScale pps = null; switch( parameter.SqlType.DbType ) *************** *** 92,101 **** case DbType.AnsiString: case DbType.AnsiStringFixedLength: ! pl = parameter as SqlCommand.ParameterLength; dbParam.Size = dialect.MaxAnsiStringSize; break; case DbType.Binary: ! pl = parameter as SqlCommand.ParameterLength; dbParam.Size = dialect.MaxBinarySize; break; --- 94,103 ---- case DbType.AnsiString: case DbType.AnsiStringFixedLength: ! pl = parameter as ParameterLength; dbParam.Size = dialect.MaxAnsiStringSize; break; case DbType.Binary: ! pl = parameter as ParameterLength; dbParam.Size = dialect.MaxBinarySize; break; *************** *** 103,111 **** case DbType.String: case DbType.StringFixedLength: ! pl = parameter as SqlCommand.ParameterLength; dbParam.Size = dialect.MaxStringSize; break; case DbType.Decimal: ! pps = parameter as SqlCommand.ParameterPrecisionScale; //TODO: remove this hardcoding... dbParam.Precision = 19; --- 105,113 ---- case DbType.String: case DbType.StringFixedLength: ! pl = parameter as ParameterLength; dbParam.Size = dialect.MaxStringSize; break; case DbType.Decimal: ! pps = parameter as ParameterPrecisionScale; //TODO: remove this hardcoding... dbParam.Precision = 19; Index: IDriver.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Driver/IDriver.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** IDriver.cs 19 Jul 2004 03:20:25 -0000 1.5 --- IDriver.cs 16 Aug 2004 05:21:12 -0000 1.6 *************** *** 2,5 **** --- 2,7 ---- using System.Data; + using NHibernate.SqlCommand; + namespace NHibernate.Driver { *************** *** 178,182 **** /// <param name="sqlString">The SqlString that contains the sql and parameters.</param> /// <returns>An IDbCommand with the CommandText and Parameters fully set.</returns> ! IDbCommand GenerateCommand(Dialect.Dialect dialect, SqlCommand.SqlString sqlString); /// <summary> --- 180,184 ---- /// <param name="sqlString">The SqlString that contains the sql and parameters.</param> /// <returns>An IDbCommand with the CommandText and Parameters fully set.</returns> ! IDbCommand GenerateCommand(Dialect.Dialect dialect, SqlString sqlString); /// <summary> |