diff --git a/src/norm/private/postgres/dbtypes.nim b/src/norm/private/postgres/dbtypes.nim index b8012b24..e9a5cdeb 100644 --- a/src/norm/private/postgres/dbtypes.nim +++ b/src/norm/private/postgres/dbtypes.nim @@ -52,9 +52,9 @@ func dbValue*[T: Model](val: Option[T]): DbValue = else: dbValue(nil) -func dbValue*[_](val: StringOfCap[_]): DbValue = dbValue(string(val)) +func dbValue*[T](val: StringOfCap[T]): DbValue = dbValue(string(val)) -func dbValue*[_](val: PaddedStringOfCap[_]): DbValue = dbValue(string(val)) +func dbValue*[T](val: PaddedStringOfCap[T]): DbValue = dbValue(string(val)) # Converter funcs from ``DbValue`` instances to Nim types: @@ -67,9 +67,9 @@ func to*(dbVal; T: typedesc[SomeFloat]): T = dbVal.f.T func to*(dbVal; T: typedesc[string]): T = dbVal.s -func to*[_](dbVal; T: typedesc[StringOfCap[_]]): T = dbVal.o.value.T +func to*[U](dbVal; T: typedesc[StringOfCap[U]]): T = dbVal.o.value.T -func to*[_](dbVal; T: typedesc[PaddedStringOfCap[_]]): T = dbVal.o.value.T +func to*[U](dbVal; T: typedesc[PaddedStringOfCap[U]]): T = dbVal.o.value.T func to*(dbVal; T: typedesc[bool]): T = dbVal.b diff --git a/src/norm/private/sqlite/dbtypes.nim b/src/norm/private/sqlite/dbtypes.nim index 38b56c9b..a33a0cc6 100644 --- a/src/norm/private/sqlite/dbtypes.nim +++ b/src/norm/private/sqlite/dbtypes.nim @@ -46,9 +46,9 @@ func dbValue*(val: DateTime): DbValue = dbValue(val.toTime().toUnixFloat()) func dbValue*[T: Model](val: T): DbValue = dbValue(val.id) -func dbValue*[_](val: StringOfCap[_]): DbValue = dbValue(string(val)) +func dbValue*[T](val: StringOfCap[T]): DbValue = dbValue(string(val)) -func dbValue*[_](val: PaddedStringOfCap[_]): DbValue = dbValue(string(val)) +func dbValue*[T](val: PaddedStringOfCap[T]): DbValue = dbValue(string(val)) func dbValue*(val: Option[bool]): DbValue = if val.isSome: @@ -90,9 +90,9 @@ func to*(dbVal; T: typedesc[DbBlob]): T = dbVal.b proc to*(dbVal; T: typedesc[DateTime]): T = utc dbVal.f.fromUnixFloat() -func to*[_](dbVal; T: typedesc[StringOfCap[_]]): T = dbVal.s.T +func to*[U](dbVal; T: typedesc[StringOfCap[U]]): T = dbVal.s.T -func to*[_](dbVal; T: typedesc[PaddedStringOfCap[_]]): T = dbVal.s.T +func to*[U](dbVal; T: typedesc[PaddedStringOfCap[U]]): T = dbVal.s.T func to*(dbVal; T: typedesc[Model]): T = ## This is never called and exists only to please the compiler. diff --git a/src/norm/types.nim b/src/norm/types.nim index bcd97a89..64fb9fb1 100644 --- a/src/norm/types.nim +++ b/src/norm/types.nim @@ -14,15 +14,15 @@ func newStringOfCap*[C: static[int]](val = ""): StringOfCap[C] = func newPaddedStringOfCap*[C: static[int]](val = ""): PaddedStringOfCap[C] = PaddedStringOfCap[C](val.alignLeft(C)) -func `==`*[_](x, y: StringOfCap[_]): bool = +func `==`*[T](x, y: StringOfCap[T]): bool = string(x) == string(y) -func `==`*[_](x, y: PaddedStringOfCap[_]): bool = +func `==`*[T](x, y: PaddedStringOfCap[T]): bool = string(x) == string(y) -func `$`*[_](s: StringOfCap[_]): string = +func `$`*[T](s: StringOfCap[T]): string = string(s) -func `$`*[_](s: PaddedStringOfCap[_]): string = +func `$`*[T](s: PaddedStringOfCap[T]): string = string(s)