Fix Field-Initializers protection (#5)

* set new init-methods for Fields to public

* trim lines

* remove code causing warning

* style changes

Co-authored-by: Roland Ambs <[email protected]>

Author: planetMDX

Sources/ClickHouseVapor/ClickHouseColumnConvertible.swift

@@ -89,7 +89,7 @@ public final class Field<Value: ClickHouseDataType>: ClickHouseColumnConvertible
         self
     }
 
-    
+
     fileprivate init(
         key: String,
         isPrimary: Bool = false,
@@ -104,6 +104,7 @@ public final class Field<Value: ClickHouseDataType>: ClickHouseColumnConvertible
         self.columnMetadata = columnMetadata
         self.wrappedValue = []
     }
+
     public init(
         key: String,
         isPrimary: Bool = false,
@@ -119,7 +120,7 @@ public final class Field<Value: ClickHouseDataType>: ClickHouseColumnConvertible
     }
 }
 
-extension Field where Value == String {
+public extension Field where Value == String {
     convenience init(
         key: String,
         isPrimary: Bool = false,
@@ -130,7 +131,8 @@ extension Field where Value == String {
         self.init(key: key, isPrimary: isPrimary, isOrderBy: isOrderBy, isLowCardinality: isLowCardinality, columnMetadata: .fixedStringLength(fixedStringLen))
     }
 }
-extension Field where Value == ClickHouseDateTime {
+
+public extension Field where Value == ClickHouseDateTime {
     convenience init(
         key: String,
         isPrimary: Bool = false,
@@ -140,9 +142,8 @@ extension Field where Value == ClickHouseDateTime {
     ) {
         self.init(key: key, isPrimary: isPrimary, isOrderBy: isOrderBy, isLowCardinality: isLowCardinality, columnMetadata: .dateTimeTimeZone(timeZone))
     }
-    
 }
-extension Field where Value == ClickHouseDateTime64 {
+public extension Field where Value == ClickHouseDateTime64 {
     convenience init(
         key: String,
         isPrimary: Bool = false,
@@ -153,6 +154,7 @@ extension Field where Value == ClickHouseDateTime64 {
     ) {
         self.init(key: key, isPrimary: isPrimary, isOrderBy: isOrderBy, isLowCardinality: isLowCardinality, columnMetadata: .dateTime64Precision(precision, timeZone))
     }
+
     convenience init(
         key: String,
         isPrimary: Bool = false,
@@ -162,7 +164,7 @@ extension Field where Value == ClickHouseDateTime64 {
         fatalError("missing precision for DateTime64")
     }
 }
-extension Field where Value == ClickHouseEnum8 {
+public extension Field where Value == ClickHouseEnum8 {
     convenience init(
         key: String,
         isPrimary: Bool = false,
@@ -182,7 +184,7 @@ extension Field where Value == ClickHouseEnum8 {
         fatalError("missing enum-mapping for enum8")
     }
 }
-extension Field where Value == ClickHouseEnum16 {
+public extension Field where Value == ClickHouseEnum16 {
     convenience init(
         key: String,
         isPrimary: Bool = false,
@@ -192,6 +194,7 @@ extension Field where Value == ClickHouseEnum16 {
     ) {
         self.init(key: key, isPrimary: isPrimary, isOrderBy: isOrderBy, isLowCardinality: isLowCardinality, columnMetadata: .enum16Map(mapping))
     }
+
     convenience init(
         key: String,
         isPrimary: Bool = false,

Sources/ClickHouseVapor/ClickHouseEngine.swift

@@ -117,7 +117,7 @@ extension ClickHouseTypeName {
             return true
         case .nullable(let type):
             return type.supportsLowCardinality
-        case .array(let type):
+        case .array:
             return false
         case .boolean: 
             return false

Tests/ClickHouseVaporTests/ClickHouseVaporTests.swift

@@ -54,7 +54,7 @@ public class TestModel: ClickHouseModel {
     @Field(key: "datt64", precision: 3)
     var datt64: [ ClickHouseDateTime64 ]
 
-    @Field(key: "datt64z", precision: 3,timeZone: "'GMT'")
+    @Field(key: "datt64z", precision: 3, timeZone: "'GMT'")
     var datt64z: [ ClickHouseDateTime64 ]
 
     @Field(key: "en8", mapping: ["a": 0, "b": 1])