WIP on count impl; reworking comparisons

src/main/kotlin/Parameters.kt

@@ -46,22 +46,8 @@ object Parameters {
      * @param existing Any existing parameters for the query (optional, defaults to empty collection)
      * @return A collection of parameters for the query
      */
-    fun addFields(
-        fields: Collection<Field<*>>,
-        existing: MutableCollection<Parameter<*>> = mutableListOf()
-    ): MutableCollection<Parameter<*>> {
-        existing.addAll(
-            fields
-                .filter { it.comparison.op != Op.EXISTS && it.comparison.op != Op.NOT_EXISTS }
-                .map {
-                    Parameter(
-                        it.parameterName!!,
-                        if (it.comparison.isNumeric) ParameterType.NUMBER else ParameterType.STRING,
-                        it.comparison.value
-                    )
-                })
-        return existing
-    }
+    fun addFields(fields: Collection<Field<*>>, existing: MutableCollection<Parameter<*>> = mutableListOf()) =
+        fields.fold(existing) { acc, field -> field.appendParameter(acc) }
 
     /**
      * Replace the parameter names in the query with question marks
@@ -72,7 +58,7 @@ object Parameters {
      */
     fun replaceNamesInQuery(query: String, parameters: Collection<Parameter<*>>) =
         parameters.sortedByDescending { it.name.length }.fold(query) { acc, param -> acc.replace(param.name, "?") }
-
+            .also(::println)
     /**
      * Apply the given parameters to the given query, returning a prepared statement
      *