@@ -57,8 +57,8 @@ public override string ToString()
57 57
ExternalId.ToString());
58 58 59 59
return constructor +
60 -
(Bindings == null ? null : ("\r\n{\r\n " + Bindings.ToString(",\r\n ").Indent(4) + "\r\n}")) +
61 -
(Mixins == null ? null : ("\r\n" + Mixins.ToString(m => ".Mixin({0})".FormatWith(m), "\r\n")));
60 +
(Bindings == null ? null : ("\n{\n " + Bindings.ToString(",\n ").Indent(4) + "\n}")) +
61 +
(Mixins == null ? null : ("\n" + Mixins.ToString(m => ".Mixin({0})".FormatWith(m), "\n")));
62 62
}
63 63 64 64
public Expression GetBinding(FieldInfo fi)
@@ -131,10 +131,10 @@ public override string ToString()
131 131
{
132 132
string constructor = "new {0}".FormatWith(Type.TypeName());
133 133 134 -
string bindings = Bindings?.Let(b => b.ToString(",\r\n ")) ?? "";
134 +
string bindings = Bindings?.Let(b => b.ToString(",\n ")) ?? "";
135 135 136 136
return bindings.HasText() ?
137 -
constructor + "\r\n{" + bindings.Indent(4) + "\r\n}" :
137 +
constructor + "\n{" + bindings.Indent(4) + "\n}" :
138 138
constructor;
139 139
}
140 140
@@ -197,10 +197,10 @@ public override string ToString()
197 197
{
198 198
string constructor = "new {0}".FormatWith(Type.TypeName());
199 199 200 -
string bindings = Bindings?.Let(b => b.ToString(",\r\n ")) ?? "";
200 +
string bindings = Bindings?.Let(b => b.ToString(",\n ")) ?? "";
201 201 202 202
return bindings.HasText() ?
203 -
constructor + "\r\n{" + bindings.Indent(4) + "\r\n}" :
203 +
constructor + "\n{" + bindings.Indent(4) + "\n}" :
204 204
constructor;
205 205
}
206 206
@@ -251,8 +251,8 @@ public ImplementedByExpression(Type type, CombineStrategy strategy, IDictionary<
251 251 252 252
public override string ToString()
253 253
{
254 -
return "ImplementedBy({0}){{\r\n{1}\r\n}}".FormatWith(Strategy,
255 -
Implementations.ToString(kvp => "{0} -> {1}".FormatWith(kvp.Key.TypeName(), kvp.Value.ToString()), "\r\n").Indent(4)
254 +
return "ImplementedBy({0}){{\n{1}\n}}".FormatWith(Strategy,
255 +
Implementations.ToString(kvp => "{0} -> {1}".FormatWith(kvp.Key.TypeName(), kvp.Value.ToString()), "\n").Indent(4)
256 256
);
257 257
}
258 258
@@ -269,20 +269,22 @@ internal class ImplementedByAllExpression : DbExpression
269 269
public readonly IntervalExpression? ExternalPeriod;
270 270 271 271 272 -
public ImplementedByAllExpression(Type type, ReadOnlyDictionary<Type/*PrimaryKey type*/, Expression> ids, TypeImplementedByAllExpression typeId, IntervalExpression? externalPeriod)
272 +
public ImplementedByAllExpression(Type type, IDictionary<Type/*PrimaryKey type*/, Expression> ids, TypeImplementedByAllExpression typeId, IntervalExpression? externalPeriod)
273 273
: base(DbExpressionType.ImplementedByAll, type)
274 274
{
275 275
if (ids == null)
276 276
throw new ArgumentNullException(nameof(ids));
277 277 278 -
this.Ids = ids;
278 +
this.Ids = ids.ToReadOnly();
279 279
this.TypeId = typeId ?? throw new ArgumentNullException(nameof(typeId));
280 280
this.ExternalPeriod = externalPeriod;
281 281
}
282 282 283 283
public override string ToString()
284 284
{
285 -
return "ImplementedByAll{{ Ids = {0}, Type = {1} }}".FormatWith(Ids, TypeId);
285 +
return "ImplementedByAll{{\n Ids = {0},\n Type = {1}\n}}".FormatWith(
286 +
Ids.ToString(kvp => "{0} -> {1}".FormatWith(kvp.Key.TypeName(), kvp.Value.ToString()), "\n"),
287 +
TypeId);
286 288
}
287 289 288 290
protected override Expression Accept(DbExpressionVisitor visitor)
@@ -345,11 +347,11 @@ internal LiteReferenceExpression WithExpandLite(ExpandLite expandLite)
345 347
internal class LiteValueExpression : DbExpression
346 348
{
347 349
public readonly Expression TypeId;
348 -
public readonly Expression Id;
350 +
public readonly PrimaryKeyExpression Id;
349 351
public readonly Expression? ToStr;
350 352 351 353 352 -
public LiteValueExpression(Type type, Expression typeId, Expression id, Expression? toStr) :
354 +
public LiteValueExpression(Type type, Expression typeId, PrimaryKeyExpression id, Expression? toStr) :
353 355
base(DbExpressionType.LiteValue, type)
354 356
{
355 357
this.TypeId = typeId ?? throw new ArgumentNullException(nameof(typeId));
@@ -368,7 +370,15 @@ protected override Expression Accept(DbExpressionVisitor visitor)
368 370
}
369 371
}
370 372 371 -
internal class TypeEntityExpression : DbExpression
373 +
internal abstract class TypeDbExpression : DbExpression
374 +
{
375 +
public TypeDbExpression(DbExpressionType dbType, Type type)
376 +
: base(dbType, type)
377 +
{
378 +
}
379 +
}
380 + 381 +
internal class TypeEntityExpression : TypeDbExpression
372 382
{
373 383
public readonly PrimaryKeyExpression ExternalId;
374 384
public readonly Type TypeValue;
@@ -391,7 +401,7 @@ protected override Expression Accept(DbExpressionVisitor visitor)
391 401
}
392 402
}
393 403 394 -
internal class TypeImplementedByExpression : DbExpression
404 +
internal class TypeImplementedByExpression : TypeDbExpression
395 405
{
396 406
public readonly ReadOnlyDictionary<Type, PrimaryKeyExpression> TypeImplementations;
397 407
@@ -415,7 +425,8 @@ protected override Expression Accept(DbExpressionVisitor visitor)
415 425
}
416 426
}
417 427 418 -
internal class TypeImplementedByAllExpression : DbExpression
428 + 429 +
internal class TypeImplementedByAllExpression : TypeDbExpression
419 430
{
420 431
public readonly PrimaryKeyExpression TypeColumn;
421 432
@@ -539,7 +550,7 @@ public MListElementExpression(PrimaryKeyExpression rowId, EntityExpression paren
539 550 540 551
public override string ToString()
541 552
{
542 -
return "MListElement({0})\r\n{{\r\nParent={1},\r\nOrder={2},\r\nElement={3}}})".FormatWith(
553 +
return "MListElement({0})\n{{\nParent={1},\nOrder={2},\nElement={3}}})".FormatWith(
543 554
RowId.ToString(),
544 555
Parent.ToString(),
545 556
Order?.ToString(),
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4