Fixed Marr multiple where clause issue

This commit is contained in:
Mark McDowall 2013-05-27 23:03:37 -07:00
parent 70126a302a
commit 340c79b81e
1 changed files with 4 additions and 4 deletions

View File

@ -45,28 +45,28 @@ namespace Marr.Data.QGen
public virtual SortBuilder<T> OrWhere(Expression<Func<T, bool>> filterExpression) public virtual SortBuilder<T> OrWhere(Expression<Func<T, bool>> filterExpression)
{ {
var orWhere = new WhereBuilder<T>(_db.Command, _dialect, filterExpression, _tables, _useAltName, true); var orWhere = new WhereBuilder<T>(_db.Command, _dialect, filterExpression, _tables, false, true);
_whereBuilder.Append(orWhere, WhereAppendType.OR); _whereBuilder.Append(orWhere, WhereAppendType.OR);
return this; return this;
} }
public virtual SortBuilder<T> OrWhere(string whereClause) public virtual SortBuilder<T> OrWhere(string whereClause)
{ {
var orWhere = new WhereBuilder<T>(whereClause, _useAltName); var orWhere = new WhereBuilder<T>(whereClause, false);
_whereBuilder.Append(orWhere, WhereAppendType.OR); _whereBuilder.Append(orWhere, WhereAppendType.OR);
return this; return this;
} }
public virtual SortBuilder<T> AndWhere(Expression<Func<T, bool>> filterExpression) public virtual SortBuilder<T> AndWhere(Expression<Func<T, bool>> filterExpression)
{ {
var andWhere = new WhereBuilder<T>(_db.Command, _dialect, filterExpression, _tables, _useAltName, true); var andWhere = new WhereBuilder<T>(_db.Command, _dialect, filterExpression, _tables, false, true);
_whereBuilder.Append(andWhere, WhereAppendType.AND); _whereBuilder.Append(andWhere, WhereAppendType.AND);
return this; return this;
} }
public virtual SortBuilder<T> AndWhere(string whereClause) public virtual SortBuilder<T> AndWhere(string whereClause)
{ {
var andWhere = new WhereBuilder<T>(whereClause, _useAltName); var andWhere = new WhereBuilder<T>(whereClause, false);
_whereBuilder.Append(andWhere, WhereAppendType.AND); _whereBuilder.Append(andWhere, WhereAppendType.AND);
return this; return this;
} }