Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 4464222

Browse files
mythzmythz
committed
Merge branch 'master' of github.com:ServiceStack/ServiceStack.OrmLite
2 parents 0e6d55d + 808663b commit 4464222

File tree

8 files changed

+91
-12
lines changed

8 files changed

+91
-12
lines changed

‎src/ServiceStack.OrmLite.Oracle.Tests/OracleParamTests.cs

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,41 +35,55 @@ public void ORA_ParamTestInsert()
3535
db.Insert(new ParamTestBo { Id = 2, Double = 0.002, Int = 200, Info = "Two", NullableBool = true, DateTime = dateTimeNow });
3636
db.Insert(new ParamTestBo { Id = 3, Double = 0.003, Int = 300, Info = "Three", NullableBool = false, DateTime = dateTimeNow.AddDays(23) });
3737
db.Insert(new ParamTestBo { Id = 4, Double = 0.004, Int = 400, Info = "Four", NullableBool = null });
38+
db.Insert(new ParamTestBo { Id = 5, Double = 0.005, Int = 500, Info = "Five", NullableBool = null, UInt = uint.MaxValue});
3839

3940
var bo1 = db.Select<ParamTestBo>(q => q.Id == 1).Single();
4041
var bo2 = db.Select<ParamTestBo>(q => q.Id == 2).Single();
4142
var bo3 = db.Select<ParamTestBo>(q => q.Id == 3).Single();
4243
var bo4 = db.Select<ParamTestBo>(q => q.Id == 4).Single();
44+
var bo5 = db.Select<ParamTestBo>(q => q.Id == 5).Single();
4345

4446
Assert.AreEqual(1, bo1.Id);
4547
Assert.AreEqual(2, bo2.Id);
4648
Assert.AreEqual(3, bo3.Id);
4749
Assert.AreEqual(4, bo4.Id);
50+
Assert.AreEqual(5, bo5.Id);
4851

4952
Assert.AreEqual(0.001, bo1.Double);
5053
Assert.AreEqual(0.002, bo2.Double);
5154
Assert.AreEqual(0.003, bo3.Double);
5255
Assert.AreEqual(0.004, bo4.Double);
56+
Assert.AreEqual(0.005, bo5.Double);
5357

5458
Assert.AreEqual(100, bo1.Int);
5559
Assert.AreEqual(200, bo2.Int);
5660
Assert.AreEqual(300, bo3.Int);
5761
Assert.AreEqual(400, bo4.Int);
62+
Assert.AreEqual(500, bo5.Int);
5863

5964
Assert.AreEqual("One", bo1.Info);
6065
Assert.AreEqual("Two", bo2.Info);
6166
Assert.AreEqual("Three", bo3.Info);
6267
Assert.AreEqual("Four", bo4.Info);
68+
Assert.AreEqual("Five", bo5.Info);
6369

6470
Assert.AreEqual(null, bo1.NullableBool);
6571
Assert.AreEqual(true, bo2.NullableBool);
6672
Assert.AreEqual(false, bo3.NullableBool);
6773
Assert.AreEqual(null, bo4.NullableBool);
74+
Assert.AreEqual(null, bo5.NullableBool);
6875

6976
Assert.AreEqual(dateTimeNow, bo1.DateTime);
7077
Assert.AreEqual(dateTimeNow, bo2.DateTime);
7178
Assert.AreEqual(dateTimeNow.AddDays(23), bo3.DateTime);
7279
Assert.AreEqual(null, bo4.DateTime);
80+
Assert.AreEqual(null, bo5.DateTime);
81+
82+
Assert.AreEqual(null, bo1.UInt);
83+
Assert.AreEqual(null, bo2.UInt);
84+
Assert.AreEqual(null, bo3.UInt);
85+
Assert.AreEqual(null, bo4.UInt);
86+
Assert.AreEqual(uint.MaxValue, bo5.UInt);
7387
}
7488
}
7589

@@ -171,10 +185,11 @@ public void ORA_ParamTestSelectLambda()
171185
LoadParamTestBo(db);
172186

173187
//select multiple items
174-
Assert.AreEqual(2, db.Select<ParamTestBo>(q => q.NullableBool == null).Count);
175-
Assert.AreEqual(2, db.Select<ParamTestBo>(q => q.NullableBool == null).Count);
188+
Assert.AreEqual(3, db.Select<ParamTestBo>(q => q.NullableBool == null).Count);
176189
Assert.AreEqual(1, db.Select<ParamTestBo>(q => q.NullableBool == true).Count);
177190
Assert.AreEqual(1, db.Select<ParamTestBo>(q => q.NullableBool == false).Count);
191+
Assert.AreEqual(1, db.Select<ParamTestBo>(q => q.UInt == uint.MaxValue).Count);
192+
Assert.AreEqual(4, db.Select<ParamTestBo>(q => q.UInt == null).Count);
178193

179194
Assert.AreEqual(1, db.Select<ParamTestBo>(q => q.Info == "Two").Count);
180195
Assert.AreEqual(1, db.Select<ParamTestBo>(q => q.Int == 300).Count);
@@ -188,6 +203,7 @@ private void LoadParamTestBo(IDbConnection db)
188203
db.Insert(new ParamTestBo { Id = 2, Double = 0.002, Int = 200, Info = "Two", NullableBool = true });
189204
db.Insert(new ParamTestBo { Id = 3, Double = 0.003, Int = 300, Info = "Three", NullableBool = false });
190205
db.Insert(new ParamTestBo { Id = 4, Double = 0.004, Int = 400, Info = "Four", NullableBool = null });
206+
db.Insert(new ParamTestBo { Id = 5, Double = 0.005, Int = 500, Info = "Five", NullableBool = null, UInt = uint.MaxValue});
191207
}
192208

193209
[Test]
@@ -1156,6 +1172,7 @@ public class ParamTestBo
11561172
public double Double { get; set; }
11571173
public bool? NullableBool { get; set; }
11581174
public DateTime? DateTime { get; set; }
1175+
public uint? UInt { get; set; }
11591176
}
11601177

11611178
public class ParamRelBo

‎src/ServiceStack.OrmLite.Oracle/Converters/OracleEnumConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public override object ToDbValue(Type fieldType, object value)
3939
return null;
4040
enumValue = enumValue.Trim('"');
4141
return enumValue == ""
42-
? "null"
42+
? null
4343
: enumValue;
4444
}
4545
}

‎src/ServiceStack.OrmLite.Oracle/Converters/OracleIntegerConverters.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ public class OracleUInt16Converter : UInt16Converter
2323
{
2424
public override DbType DbType
2525
{
26-
get { return DbType.Int16; }
26+
get { return DbType.Decimal; }
2727
}
2828
}
2929

3030
public class OracleUInt32Converter : UInt32Converter
3131
{
3232
public override DbType DbType
3333
{
34-
get { return DbType.Int32; }
34+
get { return DbType.Decimal; }
3535
}
3636

3737
public override string ColumnDefinition
@@ -44,7 +44,7 @@ public class OracleUInt64Converter : UInt64Converter
4444
{
4545
public override DbType DbType
4646
{
47-
get { return DbType.Int64; }
47+
get { return DbType.Decimal; }
4848
}
4949

5050
public override string ColumnDefinition

‎src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Reflection;
88
using System.Text;
99
using System.Text.RegularExpressions;
10+
using ServiceStack.OrmLite.Converters;
1011
using ServiceStack.OrmLite.Oracle.Converters;
1112

1213
namespace ServiceStack.OrmLite.Oracle
@@ -414,6 +415,40 @@ public override long InsertAndGetLastInsertId<T>(IDbCommand dbCmd)
414415
// return value;
415416
//}
416417

418+
public override object ToDbValue(object value, Type type)
419+
{
420+
if (value == null || value is DBNull)
421+
return null;
422+
423+
if (type.IsEnum)
424+
return EnumConverter.ToDbValue(type, value);
425+
426+
if (type.IsRefType())
427+
return ReferenceTypeConverter.ToDbValue(type, value);
428+
429+
IOrmLiteConverter converter = null;
430+
try
431+
{
432+
if (Converters.TryGetValue(type, out converter))
433+
{
434+
if (type == typeof(DateTimeOffset))
435+
{
436+
return converter.ToQuotedString(type, value);
437+
}
438+
439+
return converter.ToDbValue(type, value);
440+
}
441+
}
442+
catch (Exception ex)
443+
{
444+
Log.Error("Error in {0}.ToDbValue() value '{1}' and Type '{2}'"
445+
.Fmt(converter.GetType().Name, value != null ? value.GetType().Name : "undefined", type.Name), ex);
446+
throw;
447+
}
448+
449+
return base.ToDbValue(value, type);
450+
}
451+
417452
const string IsoDateFormat = "yyyy-MM-dd";
418453
const string IsoTimeFormat = "HH:mm:ss";
419454
const string IsoMillisecondFormat = "fffffff";

‎src/ServiceStack.OrmLite/Converters/DateTimeOffsetConverter.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ public override object FromDbValue(Type fieldType, object value)
2525
var moment = DateTimeOffset.Parse(strValue, null, DateTimeStyles.RoundtripKind);
2626
return moment;
2727
}
28+
if (value.GetType() == fieldType)
29+
{
30+
return value;
31+
}
2832
if (value is DateTime)
2933
{
3034
return new DateTimeOffset((DateTime)value);

‎src/ServiceStack.OrmLite/Expressions/ParameterizedSqlExpression.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ protected virtual void ConvertToPlaceholderAndParameter(ref object right)
3434

3535
public override object GetValue(object value, Type type)
3636
{
37-
return ((!OrmLiteConfig.UseParameterizeSqlExpressions) || SkipParameterizationForThisExpression)
38-
? DialectProvider.GetQuotedValue(value, type)
39-
: DialectProvider.GetParamValue(value, type);
37+
if ((!OrmLiteConfig.UseParameterizeSqlExpressions) || SkipParameterizationForThisExpression)
38+
return DialectProvider.GetQuotedValue(value, type);
39+
40+
var paramValue = DialectProvider.GetParamValue(value, type);
41+
return paramValue ?? "null";
4042
}
4143

4244
protected override void VisitFilter(string operand, object originalLeft, object originalRight, ref object left, ref object right)

‎src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ public virtual object ToDbValue(object value, Type type)
356356
}
357357
catch (Exception ex)
358358
{
359-
Log.Error("Error in {0}.FromDbValue() value '{1}' and Type '{2}'"
359+
Log.Error("Error in {0}.ToDbValue() value '{1}' and Type '{2}'"
360360
.Fmt(converter.GetType().Name, value != null ? value.GetType().Name : "undefined", type.Name), ex);
361361
throw;
362362
}
@@ -368,7 +368,7 @@ public virtual object ToDbValue(object value, Type type)
368368
}
369369
catch (Exception)
370370
{
371-
Log.ErrorFormat("Error FromDbValue trying to convert {0} into {1}", value, type.Name);
371+
Log.ErrorFormat("Error ToDbValue trying to convert {0} into {1}", value, type.Name);
372372
throw;
373373
}
374374
}
@@ -1424,7 +1424,7 @@ public virtual string GetQuotedValue(object value, Type fieldType)
14241424

14251425
public virtual object GetParamValue(object value, Type fieldType)
14261426
{
1427-
return FromDbValue(value, fieldType);
1427+
return ToDbValue(value, fieldType);
14281428
}
14291429

14301430
public virtual string EscapeWildcards(string value)

‎tests/ServiceStack.OrmLite.Tests/Expression/EqualityExpressionsTest.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,27 @@ public void Can_select_not_equals_null_espression()
289289
}
290290

291291
// Assume not equal works ;-)
292+
[Test]
293+
public void Can_select_equals_variable_null_expression()
294+
{
295+
object columnValue = null;
296+
297+
var expected = new TestType()
298+
{
299+
IntColumn = 12,
300+
BoolColumn = false,
301+
StringColumn = "test",
302+
NullableCol = new TestType { StringColumn = "sometext" }
303+
};
304+
305+
EstablishContext(10, expected);
306+
307+
var actual = OpenDbConnection().Select<TestType>(q => q.NullableCol == columnValue);
308+
309+
Assert.IsNotNull(actual);
310+
Assert.AreEqual(actual.Count, 10);
311+
CollectionAssert.DoesNotContain(actual, expected);
312+
}
292313
#endregion
293314
}
294315
}

0 commit comments

Comments
 (0)