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

Commit bc64508

Browse files
mythzmythz
committed
Fix Firebird tests by deleting outdated bespoke code - the best way to do it!
1 parent 7c842cb commit bc64508

File tree

10 files changed

+140
-268
lines changed

10 files changed

+140
-268
lines changed

‎src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class FirebirdOrmLiteDialectProvider : OrmLiteDialectProviderBase<Firebir
1414
{
1515
public static List<string> RESERVED = new List<string>(new[] {
1616
"USER","ORDER","PASSWORD", "ACTIVE","LEFT","DOUBLE", "FLOAT", "DECIMAL","STRING", "DATE","DATETIME", "TYPE","TIMESTAMP",
17-
"INDEX","UNIQUE", "PRIMARY", "KEY", "ALTER", "DROP", "CREATE", "DELETE", "VALUES", "FUNCTION", "INT", "LONG", "CHAR", "VALUE"
17+
"INDEX","UNIQUE", "PRIMARY", "KEY", "ALTER", "DROP", "CREATE", "DELETE", "VALUES", "FUNCTION", "INT", "LONG", "CHAR", "VALUE", "TIME"
1818
});
1919

2020
public static FirebirdOrmLiteDialectProvider Instance = new FirebirdOrmLiteDialectProvider();
@@ -26,7 +26,7 @@ public FirebirdOrmLiteDialectProvider() : this(false) { }
2626
public FirebirdOrmLiteDialectProvider(bool compactGuid)
2727
{
2828
base.AutoIncrementDefinition = string.Empty;
29-
DefaultValueFormat = " DEFAULT '{0}'";
29+
DefaultValueFormat = " DEFAULT {0}";
3030
NamingStrategy = new FirebirdNamingStrategy();
3131

3232
base.InitColumnTypeMap();
@@ -140,38 +140,18 @@ public override string ToInsertRowStatement(IDbCommand cmd, object objWithProper
140140

141141
var result = GetNextValue(cmd, fieldDef.Sequence, fieldDef.GetValue(objWithProperties));
142142

143-
fieldDef.SetValueFn(objWithProperties, result);
144-
145-
PropertyInfo pi = tableType.GetProperty(fieldDef.Name,
146-
BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.FlattenHierarchy);
147-
148-
if (pi.PropertyType == typeof(String))
149-
pi.SetProperty(objWithProperties, result.ToString());
150-
else if (pi.PropertyType == typeof(Int16))
151-
pi.SetProperty(objWithProperties, Convert.ToInt16(result));
152-
else if (pi.PropertyType == typeof(Int32))
153-
pi.SetProperty(objWithProperties, Convert.ToInt32(result));
154-
else if (pi.PropertyType == typeof(Guid))
155-
pi.SetProperty(objWithProperties, result);
156-
else
157-
pi.SetProperty(objWithProperties, Convert.ToInt64(result));
143+
var fieldValue = this.ConvertNumber(fieldDef.FieldType, result);
144+
fieldDef.SetValueFn(objWithProperties, fieldValue);
158145
}
159146

160147
if (sbColumnNames.Length > 0) sbColumnNames.Append(",");
161148
if (sbColumnValues.Length > 0) sbColumnValues.Append(",");
162149

163-
try
164-
{
165-
sbColumnNames.Append(string.Format("{0}", GetQuotedColumnName(fieldDef.FieldName)));
166-
if (!string.IsNullOrEmpty(fieldDef.Sequence) && cmd == null)
167-
sbColumnValues.Append(string.Format("@{0}", fieldDef.Name));
168-
else
169-
sbColumnValues.Append(fieldDef.GetQuotedValue(objWithProperties));
170-
}
171-
catch (Exception)
172-
{
173-
throw;
174-
}
150+
sbColumnNames.Append(string.Format("{0}", GetQuotedColumnName(fieldDef.FieldName)));
151+
if (!string.IsNullOrEmpty(fieldDef.Sequence) && cmd == null)
152+
sbColumnValues.Append(string.Format("@{0}", fieldDef.Name));
153+
else
154+
sbColumnValues.Append(fieldDef.GetQuotedValue(objWithProperties));
175155
}
176156

177157
var sql = string.Format("INSERT INTO {0} ({1}) VALUES ({2});",

‎src/ServiceStack.OrmLite.Firebird/FirebirdSqlExpression.cs‎

Lines changed: 1 addition & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,11 @@
1-
using System;
2-
using System.Collections.Generic;
31
using System.Linq.Expressions;
42

53
namespace ServiceStack.OrmLite.Firebird
64
{
75
public class FirebirdSqlExpression<T> : ParameterizedSqlExpression<T>
86
{
9-
private readonly string _trueExpression;
10-
private readonly string _falseExpression;
11-
127
public FirebirdSqlExpression(IOrmLiteDialectProvider dialectProvider)
13-
: base(dialectProvider)
14-
{
15-
_trueExpression = string.Format("({0}={1})", GetQuotedTrueValue(), GetQuotedTrueValue());
16-
_falseExpression = string.Format("({0}={1})", GetQuotedTrueValue(), GetQuotedFalseValue());
17-
}
18-
19-
protected override object VisitBinary(BinaryExpression b)
20-
{
21-
object left, right;
22-
var operand = BindOperant(b.NodeType); //sep= " " ??
23-
if (operand == "AND" || operand == "OR")
24-
{
25-
var m = b.Left as MemberExpression;
26-
if (m != null && m.Expression != null
27-
&& m.Expression.NodeType == ExpressionType.Parameter)
28-
left = new PartialSqlString(string.Format("{0}={1}", VisitMemberAccess(m), GetQuotedTrueValue()));
29-
else
30-
left = Visit(b.Left);
31-
32-
m = b.Right as MemberExpression;
33-
if (m != null && m.Expression != null
34-
&& m.Expression.NodeType == ExpressionType.Parameter)
35-
right = new PartialSqlString(string.Format("{0}={1}", VisitMemberAccess(m), GetQuotedTrueValue()));
36-
else
37-
right = Visit(b.Right);
38-
39-
if (left as PartialSqlString == null && right as PartialSqlString == null)
40-
{
41-
var result = Expression.Lambda(b).Compile().DynamicInvoke();
42-
return new PartialSqlString(base.DialectProvider.GetQuotedValue(result, result.GetType()));
43-
}
44-
45-
if (left as PartialSqlString == null)
46-
left = ((bool)left) ? GetTrueExpression() : GetFalseExpression();
47-
if (right as PartialSqlString == null)
48-
right = ((bool)right) ? GetTrueExpression() : GetFalseExpression();
49-
}
50-
else
51-
{
52-
left = Visit(b.Left);
53-
right = Visit(b.Right);
54-
55-
var leftEnum = left as EnumMemberAccess;
56-
var rightEnum = right as EnumMemberAccess;
57-
58-
var rightNeedsCoercing = leftEnum != null && rightEnum == null;
59-
var leftNeedsCoercing = rightEnum != null && leftEnum == null;
60-
61-
if (rightNeedsCoercing)
62-
{
63-
var rightPartialSql = right as PartialSqlString;
64-
if (rightPartialSql == null)
65-
{
66-
right = GetValue(right, leftEnum.EnumType);
67-
}
68-
}
69-
else if (leftNeedsCoercing)
70-
{
71-
var leftPartialSql = left as PartialSqlString;
72-
if (leftPartialSql == null)
73-
{
74-
left = DialectProvider.GetQuotedValue(left, rightEnum.EnumType);
75-
}
76-
}
77-
else if (left as PartialSqlString == null && right as PartialSqlString == null)
78-
{
79-
var result = Expression.Lambda(b).Compile().DynamicInvoke();
80-
return result;
81-
}
82-
else if (left as PartialSqlString == null)
83-
{
84-
left = DialectProvider.GetQuotedValue(left, left != null ? left.GetType() : null);
85-
}
86-
else if (right as PartialSqlString == null)
87-
{
88-
right = GetValue(right, right != null ? right.GetType() : null);
89-
}
90-
}
91-
92-
if (operand == "=" && right.ToString().EqualsIgnoreCase("null"))
93-
operand = "is";
94-
else if (operand == "<>" && right.ToString().EqualsIgnoreCase("null"))
95-
operand = "is not";
96-
else if (operand == "=" || operand == "<>")
97-
{
98-
if (IsTrueExpression(right)) right = GetQuotedTrueValue();
99-
else if (IsFalseExpression(right)) right = GetQuotedFalseValue();
100-
101-
if (IsTrueExpression(left)) left = GetQuotedTrueValue();
102-
else if (IsFalseExpression(left)) left = GetQuotedFalseValue();
103-
104-
}
105-
106-
switch (operand)
107-
{
108-
case "MOD":
109-
case "COALESCE":
110-
return new PartialSqlString(string.Format("{0}({1},{2})", operand, left, right));
111-
default:
112-
return new PartialSqlString("(" + left + Sep + operand + Sep + right + ")");
113-
}
114-
}
115-
116-
protected override object VisitConstant(ConstantExpression c)
117-
{
118-
if (c.Value == null)
119-
return new PartialSqlString("null");
120-
121-
if (c.Value is bool)
122-
{
123-
object o = base.DialectProvider.GetQuotedValue(c.Value, c.Value.GetType());
124-
return new PartialSqlString(string.Format("({0}={1})", GetQuotedTrueValue(), o));
125-
}
126-
127-
return c.Value;
128-
}
8+
: base(dialectProvider) {}
1299

13010
protected override object VisitColumnAccessMethod(MethodCallExpression m)
13111
{
@@ -149,16 +29,6 @@ protected override object VisitColumnAccessMethod(MethodCallExpression m)
14929
}
15030
return new PartialSqlString(statement);
15131
}
152-
153-
private bool IsTrueExpression(object exp)
154-
{
155-
return (exp.ToString() == _trueExpression);
156-
}
157-
158-
private bool IsFalseExpression(object exp)
159-
{
160-
return (exp.ToString() == _falseExpression);
161-
}
16232
}
16333
}
16434

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,8 +1112,10 @@ protected virtual object VisitBinary(BinaryExpression b)
11121112
}
11131113
}
11141114

1115-
if (operand == "=" && right.ToString().Equals("null", StringComparison.OrdinalIgnoreCase)) operand = "is";
1116-
else if (operand == "<>" && right.ToString().Equals("null", StringComparison.OrdinalIgnoreCase)) operand = "is not";
1115+
if (operand == "=" && right.ToString().Equals("null", StringComparison.OrdinalIgnoreCase))
1116+
operand = "is";
1117+
else if (operand == "<>" && right.ToString().Equals("null", StringComparison.OrdinalIgnoreCase))
1118+
operand = "is not";
11171119

11181120
VisitFilter(operand, originalLeft, originalRight, ref left, ref right);
11191121

‎src/ServiceStack.OrmLite/IOrmLiteConverter.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,11 @@ public override string ToQuotedString(Type fieldType, object value)
111111
public static class OrmLiteConverterExtensions
112112
{
113113
public static object ConvertNumber(this IOrmLiteConverter converter, Type toIntegerType, object value)
114+
{
115+
return converter.DialectProvider.ConvertNumber(toIntegerType, value);
116+
}
117+
118+
public static object ConvertNumber(this IOrmLiteDialectProvider dialectProvider, Type toIntegerType, object value)
114119
{
115120
if (value.GetType() == toIntegerType)
116121
return value;
@@ -143,7 +148,7 @@ public static object ConvertNumber(this IOrmLiteConverter converter, Type toInte
143148
return Convert.ToDecimal(value);
144149
}
145150

146-
var convertedValue = converter.DialectProvider.StringSerializer.DeserializeFromString(value.ToString(), toIntegerType);
151+
var convertedValue = dialectProvider.StringSerializer.DeserializeFromString(value.ToString(), toIntegerType);
147152
return convertedValue;
148153
}
149154
}

‎tests/ServiceStack.OrmLite.FirebirdTests/app.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<!--<add name="testDb" connectionString="User=SYSDBA;Password=masterkey;Database=northwind;DataSource=localhost;Dialect=3;charset=ISO8859_1;MinPoolSize=0;MaxPoolSize=100;" providerName="FirebirdSql.Data.FirebirdClient" />-->
88
<add name="testDb" connectionString="User=SYSDBA;Password=masterkey;Database=localhost:C:\src\ServiceStack.OrmLite\tests\ServiceStack.OrmLite.FirebirdTests\App_Data\TEST.FDB;DataSource=localhost;Charset=NONE;Dialect=3;charset=ISO8859_1;MinPoolSize=0;MaxPoolSize=100;" providerName="FirebirdSql.Data.FirebirdClient" />
99
</connectionStrings>
10-
11-
<system.data>
12-
<DbProviderFactories>
13-
<remove invariant="FirebirdSql.Data.FirebirdClient" />
14-
<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
15-
</DbProviderFactories>
16-
</system.data></configuration>
10+
<system.data>
11+
<DbProviderFactories>
12+
<remove invariant="FirebirdSql.Data.FirebirdClient" />
13+
<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
14+
</DbProviderFactories>
15+
</system.data>
16+
</configuration>

‎tests/ServiceStack.OrmLite.Tests/DefaultValueTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ public void Can_create_table_with_DefaultValues()
5050
row.PrintDump();
5151
Assert.That(row.DefaultInt, Is.EqualTo(1));
5252
Assert.That(row.NDefaultInt, Is.EqualTo(1));
53-
Assert.That(row.DefaultDouble, Is.EqualTo(1.1));
54-
Assert.That(row.NDefaultDouble, Is.EqualTo(1.1));
53+
Assert.That(row.DefaultDouble, Is.EqualTo(1.1).Within(.1d));
54+
Assert.That(row.NDefaultDouble, Is.EqualTo(1.1).Within(.1d));
5555
Assert.That(row.DefaultString, Is.EqualTo("String"));
5656

57-
var expectedDate = Dialect != Dialect.MySql
57+
var expectedDate = Dialect != Dialect.MySql && Dialect != Dialect.Firebird
5858
? DateTime.UtcNow.Date
5959
: DateTime.Now.Date; //MySql CURRENT_TIMESTAMP == LOCAL_TIME
6060

‎tests/ServiceStack.OrmLite.Tests/Issues/SelectScalarTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void Should_Return_Scalar_Value()
3737
Assert.That(db.Scalar<Guid>(q.Select(x => x.Id)), Is.EqualTo(row.Id));
3838
Assert.That(db.Scalar<long>(q.Select(x => x.Long)), Is.EqualTo(row.Long));
3939
Assert.That(db.Scalar<decimal>(q.Select(x => x.Decimal)), Is.EqualTo(row.Decimal));
40-
Assert.That(db.Scalar<double>(q.Select(x => x.Double)), Is.EqualTo(row.Double));
40+
Assert.That(db.Scalar<double>(q.Select(x => x.Double)), Is.EqualTo(row.Double).Within(.1d));
4141
Assert.That(db.Scalar<float>(q.Select(x => x.Float)), Is.EqualTo(row.Float));
4242
}
4343
}

‎tests/ServiceStack.OrmLite.Tests/OrmLiteCreateTableWithIndexesTests.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ public void Can_create_ModelWithCompositeIndexFieldsDesc_table()
8181
[Test]
8282
public void Can_create_ModelWithCompositeIndexOnFieldSpacesDesc_table()
8383
{
84+
if (Dialect == Dialect.Firebird) return; //Too long, not supported
85+
8486
using (var db = OpenDbConnection())
8587
{
8688
db.CreateTable<ModelWithCompositeIndexOnFieldSpacesDesc>(true);

‎tests/ServiceStack.OrmLite.Tests/OrmLiteGetScalarTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ public void Can_get_scalar_value()
103103

104104
var expectedDouble = authors.Max(e => e.DoubleProperty);
105105
double r5 = db.Scalar<Author, double>(e => Sql.Max(e.DoubleProperty));
106-
Assert.That(expectedDouble, Is.EqualTo(r5));
106+
Assert.That(expectedDouble, Is.EqualTo(r5).Within(.1d));
107107

108108
expectedDouble = authors.Where(e => e.City == "London").Max(e => e.DoubleProperty);
109109
r5 = db.Scalar<Author, double>(e => Sql.Max(e.DoubleProperty), e => e.City == "London");
110-
Assert.That(expectedDouble, Is.EqualTo(r5));
110+
Assert.That(expectedDouble, Is.EqualTo(r5).Within(.1d));
111111

112112
r5 = db.Scalar<Author, double>(e => Sql.Max(e.DoubleProperty), e => e.City == "SinCity");
113113
Assert.That(default(double), Is.EqualTo(r5));

0 commit comments

Comments
 (0)