src/Postgres/Extensions.fs

@@ -50,6 +50,11 @@ module Extensions =
             WithProps.Count.all tableName (Sql.existingConnection conn)
         
         /// Count matching documents using a JSON field comparison query (->> =)
+        member conn.countByFields tableName howMatched fields =
+            WithProps.Count.byFields tableName howMatched fields (Sql.existingConnection conn)
+        
+        /// Count matching documents using a JSON field comparison query (->> =)
+        [<System.Obsolete "Use countByFields instead; will be removed in v4">]
         member conn.countByField tableName field =
             WithProps.Count.byField tableName field (Sql.existingConnection conn)
         
@@ -66,6 +71,11 @@ module Extensions =
             WithProps.Exists.byId tableName docId (Sql.existingConnection conn)
         
         /// Determine if documents exist using a JSON field comparison query (->> =)
+        member conn.existsByFields tableName howMatched fields =
+            WithProps.Exists.byFields tableName howMatched fields (Sql.existingConnection conn)
+        
+        /// Determine if documents exist using a JSON field comparison query (->> =)
+        [<System.Obsolete "Use existsByFields instead; will be removed in v4">]
         member conn.existsByField tableName field =
             WithProps.Exists.byField tableName field (Sql.existingConnection conn)
         
@@ -86,6 +96,11 @@ module Extensions =
             WithProps.Find.byId<'TKey, 'TDoc> tableName docId (Sql.existingConnection conn)
 
         /// Retrieve documents matching a JSON field comparison query (->> =)
+        member conn.findByFields<'TDoc> tableName howMatched fields =
+            WithProps.Find.byFields<'TDoc> tableName howMatched fields (Sql.existingConnection conn)
+        
+        /// Retrieve documents matching a JSON field comparison query (->> =)
+        [<System.Obsolete "Use findByFields instead; will be removed in v4">]
         member conn.findByField<'TDoc> tableName field =
             WithProps.Find.byField<'TDoc> tableName field (Sql.existingConnection conn)
         
@@ -98,6 +113,11 @@ module Extensions =
             WithProps.Find.byJsonPath<'TDoc> tableName jsonPath (Sql.existingConnection conn)
         
         /// Retrieve the first document matching a JSON field comparison query (->> =); returns None if not found
+        member conn.findFirstByFields<'TDoc> tableName howMatched fields =
+            WithProps.Find.firstByFields<'TDoc> tableName howMatched fields (Sql.existingConnection conn)
+        
+        /// Retrieve the first document matching a JSON field comparison query (->> =); returns None if not found
+        [<System.Obsolete "Use findFirstByFields instead; will be removed in v4">]
         member conn.findFirstByField<'TDoc> tableName field =
             WithProps.Find.firstByField<'TDoc> tableName field (Sql.existingConnection conn)
         
@@ -122,6 +142,11 @@ module Extensions =
             WithProps.Patch.byId tableName docId patch (Sql.existingConnection conn)
         
         /// Patch documents using a JSON field comparison query in the WHERE clause (->> =)
+        member conn.patchByFields tableName howMatched fields (patch: 'TPatch) =
+            WithProps.Patch.byFields tableName howMatched fields patch (Sql.existingConnection conn)
+        
+        /// Patch documents using a JSON field comparison query in the WHERE clause (->> =)
+        [<System.Obsolete "Use patchByFields instead; will be removed in v4">]
         member conn.patchByField tableName field (patch: 'TPatch) =
             WithProps.Patch.byField tableName field patch (Sql.existingConnection conn)
         
@@ -137,7 +162,12 @@ module Extensions =
         member conn.removeFieldsById tableName (docId: 'TKey) fieldNames =
             WithProps.RemoveFields.byId tableName docId fieldNames (Sql.existingConnection conn)
         
+        /// Remove fields from documents via a comparison on JSON fields in the document
+        member conn.removeFieldsByFields tableName howMatched fields fieldNames =
+            WithProps.RemoveFields.byFields tableName howMatched fields fieldNames (Sql.existingConnection conn)
+        
         /// Remove fields from documents via a comparison on a JSON field in the document
+        [<System.Obsolete "Use removeFieldsByFields instead; will be removed in v4">]
         member conn.removeFieldsByField tableName field fieldNames =
             WithProps.RemoveFields.byField tableName field fieldNames (Sql.existingConnection conn)
         
@@ -153,7 +183,11 @@ module Extensions =
         member conn.deleteById tableName (docId: 'TKey) =
             WithProps.Delete.byId tableName docId (Sql.existingConnection conn)
 
+        member conn.deleteByFields tableName howMatched fields =
+            WithProps.Delete.byFields tableName howMatched fields (Sql.existingConnection conn)
+        
         /// Delete documents by matching a JSON field comparison query (->> =)
+        [<System.Obsolete "Use deleteByFields instead; will be removed in v4">]
         member conn.deleteByField tableName field =
             WithProps.Delete.byField tableName field (Sql.existingConnection conn)
         
@@ -225,6 +259,12 @@ type NpgsqlConnectionCSharpExtensions =
     
     /// Count matching documents using a JSON field comparison query (->> =)
     [<Extension>]
+    static member inline CountByFields(conn, tableName, howMatched, fields) =
+        WithProps.Count.ByFields(tableName, howMatched, fields, Sql.existingConnection conn)
+    
+    /// Count matching documents using a JSON field comparison query (->> =)
+    [<Extension>]
+    [<System.Obsolete "Use CountByFields instead; will be removed in v4">]
     static member inline CountByField(conn, tableName, field) =
         WithProps.Count.byField tableName field (Sql.existingConnection conn)
     
@@ -245,6 +285,12 @@ type NpgsqlConnectionCSharpExtensions =
     
     /// Determine if documents exist using a JSON field comparison query (->> =)
     [<Extension>]
+    static member inline ExistsByFields(conn, tableName, howMatched, fields) =
+        WithProps.Exists.ByFields(tableName, howMatched, fields, Sql.existingConnection conn)
+    
+    /// Determine if documents exist using a JSON field comparison query (->> =)
+    [<Extension>]
+    [<System.Obsolete "Use ExistsByFields instead; will be removed in v4">]
     static member inline ExistsByField(conn, tableName, field) =
         WithProps.Exists.byField tableName field (Sql.existingConnection conn)
     
@@ -270,6 +316,12 @@ type NpgsqlConnectionCSharpExtensions =
 
     /// Retrieve documents matching a JSON field comparison query (->> =)
     [<Extension>]
+    static member inline FindByFields<'TDoc>(conn, tableName, howMatched, fields) =
+        WithProps.Find.ByFields<'TDoc>(tableName, howMatched, fields, Sql.existingConnection conn)
+    
+    /// Retrieve documents matching a JSON field comparison query (->> =)
+    [<Extension>]
+    [<System.Obsolete "Use FindByFields instead; will be removed in v4">]
     static member inline FindByField<'TDoc>(conn, tableName, field) =
         WithProps.Find.ByField<'TDoc>(tableName, field, Sql.existingConnection conn)
     
@@ -283,8 +335,14 @@ type NpgsqlConnectionCSharpExtensions =
     static member inline FindByJsonPath<'TDoc>(conn, tableName, jsonPath) =
         WithProps.Find.ByJsonPath<'TDoc>(tableName, jsonPath, Sql.existingConnection conn)
     
-    /// Retrieve the first document matching a JSON field comparison query (->> =); returns None if not found
+    /// Retrieve the first document matching a JSON field comparison query (->> =); returns null if not found
     [<Extension>]
+    static member inline FindFirstByFields<'TDoc when 'TDoc: null>(conn, tableName, howMatched, fields) =
+        WithProps.Find.FirstByFields<'TDoc>(tableName, howMatched, fields, Sql.existingConnection conn)
+    
+    /// Retrieve the first document matching a JSON field comparison query (->> =); returns null if not found
+    [<Extension>]
+    [<System.Obsolete "Use FindFirstByFields instead; will be removed in v4">]
     static member inline FindFirstByField<'TDoc when 'TDoc: null>(conn, tableName, field) =
         WithProps.Find.FirstByField<'TDoc>(tableName, field, Sql.existingConnection conn)
     
@@ -315,6 +373,12 @@ type NpgsqlConnectionCSharpExtensions =
     
     /// Patch documents using a JSON field comparison query in the WHERE clause (->> =)
     [<Extension>]
+    static member inline PatchByFields(conn, tableName, howMatched, fields, patch: 'TPatch) =
+        WithProps.Patch.ByFields(tableName, howMatched, fields, patch, Sql.existingConnection conn)
+    
+    /// Patch documents using a JSON field comparison query in the WHERE clause (->> =)
+    [<Extension>]
+    [<System.Obsolete "Use PatchByFields instead; will be removed in v4">]
     static member inline PatchByField(conn, tableName, field, patch: 'TPatch) =
         WithProps.Patch.byField tableName field patch (Sql.existingConnection conn)
     
@@ -333,8 +397,14 @@ type NpgsqlConnectionCSharpExtensions =
     static member inline RemoveFieldsById(conn, tableName, docId: 'TKey, fieldNames) =
         WithProps.RemoveFields.ById(tableName, docId, fieldNames, Sql.existingConnection conn)
     
+    /// Remove fields from documents via a comparison on JSON fields in the document
+    [<Extension>]
+    static member inline RemoveFieldsByFields(conn, tableName, howMatched, fields, fieldNames) =
+        WithProps.RemoveFields.ByFields(tableName, howMatched, fields, fieldNames, Sql.existingConnection conn)
+    
     /// Remove fields from documents via a comparison on a JSON field in the document
     [<Extension>]
+    [<System.Obsolete "Use RemoveFieldsByFields instead; will be removed in v4">]
     static member inline RemoveFieldsByField(conn, tableName, field, fieldNames) =
         WithProps.RemoveFields.ByField(tableName, field, fieldNames, Sql.existingConnection conn)
         
@@ -355,6 +425,12 @@ type NpgsqlConnectionCSharpExtensions =
     
     /// Delete documents by matching a JSON field comparison query (->> =)
     [<Extension>]
+    static member inline DeleteByFields(conn, tableName, howMatched, fields) =
+        WithProps.Delete.ByFields(tableName, howMatched, fields, Sql.existingConnection conn)
+    
+    /// Delete documents by matching a JSON field comparison query (->> =)
+    [<Extension>]
+    [<System.Obsolete "Use DeleteByFields instead; will be removed in v4">]
     static member inline DeleteByField(conn, tableName, field) =
         WithProps.Delete.byField tableName field (Sql.existingConnection conn)
     

src/Postgres/Library.fs

@@ -127,7 +127,7 @@ module Query =
     
     /// Create a WHERE clause fragment to implement a comparison on fields in a JSON document
     [<CompiledName "FSharpWhereByFields">]
-    let whereByFields fields howMatched =
+    let whereByFields howMatched fields =
         let name = ParameterName()
         fields
         |> List.map (fun it ->
@@ -145,19 +145,19 @@ module Query =
         |> String.concat (match howMatched with Any -> " OR " | All -> " AND ")
 
     /// Create a WHERE clause fragment to implement a comparison on fields in a JSON document
-    let WhereByFields(fields: Field seq, howMatched) =
+    let WhereByFields(howMatched, fields: Field seq) =
-        whereByFields (List.ofSeq fields) howMatched
+        whereByFields howMatched (List.ofSeq fields)
     
     /// Create a WHERE clause fragment to implement a comparison on a field in a JSON document
     [<CompiledName "WhereByField">]
     [<System.Obsolete "Use WhereByFields instead; will be removed in v4">]
     let whereByField field paramName =
-        whereByFields [ { field with ParameterName = Some paramName } ] Any
+        whereByFields Any [ { field with ParameterName = Some paramName } ]
     
     /// Create a WHERE clause fragment to implement an ID-based query
     [<CompiledName "WhereById">]
     let whereById paramName =
-        whereByFields [ { Field.EQ (Configuration.idField ()) 0 with ParameterName = Some paramName } ] Any
+        whereByFields Any [ { Field.EQ (Configuration.idField ()) 0 with ParameterName = Some paramName } ]
     
     /// Table and index definition queries
     module Definition =
@@ -197,11 +197,20 @@ module Query =
         let all tableName =
             $"SELECT COUNT(*) AS it FROM %s{tableName}"
         
+        /// Query to count matching documents using a text comparison on JSON fields
+        [<CompiledName "FSharpByFields">]
+        let byFields tableName howMatched fields =
+            $"SELECT COUNT(*) AS it FROM %s{tableName} WHERE {whereByFields howMatched fields}"
+        
         /// Query to count matching documents using a text comparison on a JSON field
         [<CompiledName "ByField">]
+        [<System.Obsolete "Use ByFields instead; will be removed in v4">]
         let byField tableName field =
-            whereByFields [ { field with ParameterName = Some "@field" } ] Any
+            byFields tableName Any [ field ]
-            |> sprintf "SELECT COUNT(*) AS it FROM %s WHERE %s" tableName
+        
+        /// Query to count matching documents using a text comparison on JSON fields
+        let ByFields tableName howMatched fields =
+            byFields tableName howMatched (List.ofSeq fields)
         
         /// Query to count matching documents using a JSON containment query (@>)
         [<CompiledName "ByContains">]
@@ -221,11 +230,20 @@ module Query =
         let byId tableName =
             $"""SELECT EXISTS (SELECT 1 FROM %s{tableName} WHERE {whereById "@id"}) AS it"""
 
+        /// Query to determine if documents exist using a comparison on JSON fields
+        [<CompiledName "FSharpByFields">]
+        let byFields tableName howMatched fields =
+            $"SELECT EXISTS (SELECT 1 FROM %s{tableName} WHERE {whereByFields howMatched fields}) AS it"
+            
         /// Query to determine if documents exist using a comparison on a JSON field
         [<CompiledName "ByField">]
+        [<System.Obsolete "Use ByFields instead; will be removed in v4">]
         let byField tableName field =
-            whereByFields [ { field with ParameterName = Some "@field" } ] Any
+            byFields tableName Any [ field ]
-            |> sprintf "SELECT EXISTS (SELECT 1 FROM %s WHERE %s) AS it" tableName
+        
+        /// Query to determine if documents exist using a comparison on JSON fields
+        let ByFields tableName howMatched fields =
+            byFields tableName howMatched (List.ofSeq fields)
             
         /// Query to determine if documents exist using a JSON containment query (@>)
         [<CompiledName "ByContains">]
@@ -245,11 +263,20 @@ module Query =
         let byId tableName =
             $"""{Query.selectFromTable tableName} WHERE {whereById "@id"}"""
         
+        /// Query to retrieve documents using a comparison on JSON fields
+        [<CompiledName "FSharpByFields">]
+        let byFields tableName howMatched fields =
+            $"{Query.selectFromTable tableName} WHERE {whereByFields howMatched fields}"
+        
         /// Query to retrieve documents using a comparison on a JSON field
         [<CompiledName "ByField">]
+        [<System.Obsolete "Use ByFields instead; will be removed in v4">]
         let byField tableName field =
-            whereByFields [ { field with ParameterName = Some "@field" } ] Any
+            byFields tableName Any [ field ]
-            |> sprintf "%s WHERE %s" (Query.selectFromTable tableName)
+        
+        /// Query to retrieve documents using a comparison on JSON fields
+        let ByFields tableName howMatched fields =
+            byFields tableName howMatched (List.ofSeq fields)
         
         /// Query to retrieve documents using a JSON containment query (@>)
         [<CompiledName "ByContains">]
@@ -273,10 +300,20 @@ module Query =
         let byId tableName =
             whereById "@id" |> update tableName
         
+        /// Query to patch documents match JSON field comparisons (->> =)
+        [<CompiledName "FSharpByFields">]
+        let byFields tableName howMatched fields =
+            whereByFields howMatched fields |> update tableName
+            
         /// Query to patch documents match a JSON field comparison (->> =)
         [<CompiledName "ByField">]
+        [<System.Obsolete "Use ByFields instead; will be removed in v4">]
         let byField tableName field =
-            whereByFields [ { field with ParameterName = Some "@field" } ] Any |> update tableName
+            byFields tableName Any [ field ]
+        
+        /// Query to patch documents match JSON field comparisons (->> =)
+        let ByFields tableName howMatched fields =
+            whereByFields howMatched (List.ofSeq fields) |> update tableName
             
         /// Query to patch documents matching a JSON containment query (@>)
         [<CompiledName "ByContains">]
@@ -300,10 +337,20 @@ module Query =
         let byId tableName =
             whereById "@id" |> update tableName
         
+        /// Query to remove fields from documents via a comparison on JSON fields within the document
+        [<CompiledName "FSharpByFields">]
+        let byFields tableName howMatched fields =
+            whereByFields howMatched fields |> update tableName
+        
         /// Query to remove fields from documents via a comparison on a JSON field within the document
         [<CompiledName "ByField">]
+        [<System.Obsolete "Use ByFields instead; will be removed in v4">]
         let byField tableName field =
-            whereByFields [ { field with ParameterName = Some "@field" } ] Any |> update tableName
+            byFields tableName Any [ field ]
+        
+        /// Query to remove fields from documents via a comparison on JSON fields within the document
+        let ByFields tableName howMatched fields =
+            whereByFields howMatched (List.ofSeq fields) |> update tableName
         
         /// Query to patch documents matching a JSON containment query (@>)
         [<CompiledName "ByContains">]
@@ -323,11 +370,20 @@ module Query =
         let byId tableName =
             $"""DELETE FROM %s{tableName} WHERE {whereById "@id"}"""
 
+        /// Query to delete documents using a comparison on JSON fields
+        [<CompiledName "FSharpByFields">]
+        let byFields tableName howMatched fields =
+            $"DELETE FROM %s{tableName} WHERE {whereByFields howMatched fields}"
+        
         /// Query to delete documents using a comparison on a JSON field
         [<CompiledName "ByField">]
+        [<System.Obsolete "Use ByFields instead; will be removed in v4">]
         let byField tableName field =
-            whereByFields [ { field with ParameterName = Some "@field" } ] Any
+            byFields tableName Any [ field ]
-            |> sprintf "DELETE FROM %s WHERE %s" tableName
+        
+        /// Query to delete documents using a comparison on JSON fields
+        let ByFields tableName howMatched fields =
+            byFields tableName howMatched (List.ofSeq fields)
         
         /// Query to delete documents using a JSON containment query (@>)
         [<CompiledName "ByContains">]
@@ -461,14 +517,20 @@ module WithProps =
         let all tableName sqlProps =
             Custom.scalar (Query.Count.all tableName) [] toCount sqlProps
         
+        /// Count matching documents using JSON field comparisons (->> =)
+        [<CompiledName "FSharpByFields">]
+        let byFields tableName howMatched fields sqlProps =
+            Custom.scalar (Query.Count.byFields tableName howMatched fields) (addFieldParams fields []) toCount sqlProps
+        
         /// Count matching documents using a JSON field comparison (->> =)
         [<CompiledName "ByField">]
+        [<System.Obsolete "Use ByFields instead; will be removed in v4">]
         let byField tableName field sqlProps =
-            Custom.scalar
+            byFields tableName Any [ field ] sqlProps
-                (Query.Count.byField tableName field)
+        
-                (addFieldParams [ { field with ParameterName = Some "@field" } ] [])
+        /// Count matching documents using JSON field comparisons (->> =)
-                toCount
+        let ByFields(tableName, howMatched, fields, sqlProps) =
-                sqlProps
+            Custom.Scalar(Query.Count.ByFields tableName howMatched fields, AddFields fields [], toCount, sqlProps)
         
         /// Count matching documents using a JSON containment query (@>)
         [<CompiledName "ByContains">]
@@ -489,14 +551,21 @@ module WithProps =
         let byId tableName (docId: 'TKey) sqlProps =
             Custom.scalar (Query.Exists.byId tableName) [ idParam docId ] toExists sqlProps
 
+        /// Determine if a document exists using JSON field comparisons (->> =)
+        [<CompiledName "FSharpByFields">]
+        let byFields tableName howMatched fields sqlProps =
+            Custom.scalar
+                (Query.Exists.byFields tableName howMatched fields) (addFieldParams fields []) toExists sqlProps
+            
         /// Determine if a document exists using a JSON field comparison (->> =)
         [<CompiledName "ByField">]
+        [<System.Obsolete "Use ByFields instead; will be removed in v4">]
         let byField tableName field sqlProps =
-            Custom.scalar
+            byFields tableName Any [ field ] sqlProps
-                (Query.Exists.byField tableName field)
+        
-                (addFieldParams [ { field with ParameterName = Some "@field" } ] [])
+        /// Determine if a document exists using JSON field comparisons (->> =)
-                toExists
+        let ByFields(tableName, howMatched, fields, sqlProps) =
-                sqlProps
+            Custom.Scalar(Query.Exists.ByFields tableName howMatched fields, AddFields fields [], toExists, sqlProps)
         
         /// Determine if a document exists using a JSON containment query (@>)
         [<CompiledName "ByContains">]
@@ -530,22 +599,27 @@ module WithProps =
         let ById<'TKey, 'TDoc when 'TDoc: null>(tableName, docId: 'TKey, sqlProps) =
             Custom.Single<'TDoc>(Query.Find.byId tableName, [ idParam docId ], fromData<'TDoc>, sqlProps)
 
-        /// Retrieve documents matching a JSON field comparison (->> =)
+        /// Retrieve documents matching JSON field comparisons (->> =)
-        [<CompiledName "FSharpByField">]
+        [<CompiledName "FSharpByFields">]
-        let byField<'TDoc> tableName field sqlProps =
+        let byFields<'TDoc> tableName howMatched fields sqlProps =
             Custom.list<'TDoc>
-                (Query.Find.byField tableName field)
+                (Query.Find.byFields tableName howMatched fields) (addFieldParams fields []) fromData<'TDoc> sqlProps
-                (addFieldParams [ { field with ParameterName = Some "@field" } ] [])
-                fromData<'TDoc>
-                sqlProps
             
         /// Retrieve documents matching a JSON field comparison (->> =)
-        let ByField<'TDoc>(tableName, field, sqlProps) =
+        [<CompiledName "FSharpByField">]
+        [<System.Obsolete "Use byFields instead; will be removed in v4">]
+        let byField<'TDoc> tableName field sqlProps =
+            byFields<'TDoc> tableName Any [ field ] sqlProps
+        
+        /// Retrieve documents matching JSON field comparisons (->> =)
+        let ByFields<'TDoc>(tableName, howMatched, fields, sqlProps) =
             Custom.List<'TDoc>(
-                Query.Find.byField tableName field,
+                Query.Find.ByFields tableName howMatched fields, AddFields fields [], fromData<'TDoc>, sqlProps)
-                addFieldParams [ { field with ParameterName = Some "@field" } ] [],
+            
-                fromData<'TDoc>,
+        /// Retrieve documents matching a JSON field comparison (->> =)
-                sqlProps)
+        [<System.Obsolete "Use ByFields instead; will be removed in v4">]
+        let ByField<'TDoc>(tableName, field, sqlProps) =
+            ByFields<'TDoc>(tableName, Any, Seq.singleton field, sqlProps)
         
         /// Retrieve documents matching a JSON containment query (@>)
         [<CompiledName "FSharpByContains">]
@@ -569,23 +643,34 @@ module WithProps =
             Custom.List<'TDoc>(
                 Query.Find.byJsonPath tableName, [ "@path", Sql.string jsonPath ], fromData<'TDoc>, sqlProps)
         
-        /// Retrieve the first document matching a JSON field comparison (->> =); returns None if not found
+        /// Retrieve the first document matching JSON field comparisons (->> =); returns None if not found
-        [<CompiledName "FSharpFirstByField">]
+        [<CompiledName "FSharpFirstByFields">]
-        let firstByField<'TDoc> tableName field sqlProps =
+        let firstByFields<'TDoc> tableName howMatched fields sqlProps =
             Custom.single<'TDoc>
-                $"{Query.Find.byField tableName field} LIMIT 1"
+                $"{Query.Find.byFields tableName howMatched fields} LIMIT 1"
-                (addFieldParams [ { field with ParameterName = Some "@field" } ] [])
+                (addFieldParams fields [])
                 fromData<'TDoc>
                 sqlProps
             
-        /// Retrieve the first document matching a JSON field comparison (->> =); returns null if not found
+        /// Retrieve the first document matching a JSON field comparison (->> =); returns None if not found
-        let FirstByField<'TDoc when 'TDoc: null>(tableName, field, sqlProps) =
+        [<CompiledName "FSharpFirstByField">]
+        [<System.Obsolete "Use firstByFields instead; will be removed in v4">]
+        let firstByField<'TDoc> tableName field sqlProps =
+            firstByFields<'TDoc> tableName Any [ field ] sqlProps
+            
+        /// Retrieve the first document matching JSON field comparisons (->> =); returns null if not found
+        let FirstByFields<'TDoc when 'TDoc: null>(tableName, howMatched, fields, sqlProps) =
             Custom.Single<'TDoc>(
-                $"{Query.Find.byField tableName field} LIMIT 1",
+                $"{Query.Find.ByFields tableName howMatched fields} LIMIT 1",
-                addFieldParams [ { field with ParameterName = Some "@field" } ] [],
+                AddFields fields [],
                 fromData<'TDoc>,
                 sqlProps)
             
+        /// Retrieve the first document matching a JSON field comparison (->> =); returns null if not found
+        [<System.Obsolete "Use FirstByFields instead; will be removed in v4">]
+        let FirstByField<'TDoc when 'TDoc: null>(tableName, field, sqlProps) =
+            FirstByFields<'TDoc>(tableName, Any, Seq.singleton field, sqlProps)
+            
         /// Retrieve the first document matching a JSON containment query (@>); returns None if not found
         [<CompiledName "FSharpFirstByContains">]
         let firstByContains<'TDoc> tableName (criteria: obj) sqlProps =
@@ -642,11 +727,24 @@ module WithProps =
             Custom.nonQuery (Query.Patch.byId tableName) [ idParam docId; jsonParam "@data" patch ] sqlProps
         
         /// Patch documents using a JSON field comparison query in the WHERE clause (->> =)
-        [<CompiledName "ByField">]
+        [<CompiledName "FSharpByFields">]
-        let byField tableName field (patch: 'TPatch) sqlProps =
+        let byFields tableName howMatched fields (patch: 'TPatch) sqlProps =
             Custom.nonQuery
-                (Query.Patch.byField tableName field)
+                (Query.Patch.byFields tableName howMatched fields)
-                (addFieldParams [ { field with ParameterName = Some "@field" } ] [ jsonParam "@data" patch ])
+                (addFieldParams fields [ jsonParam "@data" patch ])
+                sqlProps
+            
+        /// Patch documents using a JSON field comparison query in the WHERE clause (->> =)
+        [<CompiledName "ByField">]
+        [<System.Obsolete "Use ByFields instead; will be removed in v4">]
+        let byField tableName field (patch: 'TPatch) sqlProps =
+            byFields tableName Any [ field ] patch sqlProps
+        
+        /// Patch documents using a JSON field comparison query in the WHERE clause (->> =)
+        let ByFields(tableName, howMatched, fields, patch: 'TPatch, sqlProps) =
+            Custom.nonQuery
+                (Query.Patch.ByFields tableName howMatched fields)
+                (AddFields fields [ jsonParam "@data" patch ])
                 sqlProps
             
         /// Patch documents using a JSON containment query in the WHERE clause (@>)
@@ -674,17 +772,31 @@ module WithProps =
         let ById(tableName, docId: 'TKey, fieldNames, sqlProps) =
             byId tableName docId (List.ofSeq fieldNames) sqlProps
         
-        /// Remove fields from documents via a comparison on a JSON field in the document
+        /// Remove fields from documents via a comparison on JSON fields in the document
-        [<CompiledName "FSharpByField">]
+        [<CompiledName "FSharpByFields">]
-        let byField tableName field fieldNames sqlProps =
+        let byFields tableName howMatched fields fieldNames sqlProps =
             Custom.nonQuery
-                (Query.RemoveFields.byField tableName field)
+                (Query.RemoveFields.byFields tableName howMatched fields)
-                (addFieldParams [ { field with ParameterName = Some "@field" } ] [ fieldNameParam fieldNames ])
+                (addFieldParams fields [ fieldNameParam fieldNames ])
                 sqlProps
             
         /// Remove fields from documents via a comparison on a JSON field in the document
+        [<CompiledName "FSharpByField">]
+        [<System.Obsolete "Use byFields instead; will be removed in v4">]
+        let byField tableName field fieldNames sqlProps =
+            byFields tableName Any [ field ] fieldNames sqlProps
+        
+        /// Remove fields from documents via a comparison on JSON fields in the document
+        let ByFields(tableName, howMatched, fields, fieldNames, sqlProps) =
+            Custom.nonQuery
+                (Query.RemoveFields.ByFields tableName howMatched fields)
+                (AddFields fields [ FieldName fieldNames ])
+                sqlProps
+            
+        /// Remove fields from documents via a comparison on a JSON field in the document
+        [<System.Obsolete "Use ByFields instead; will be removed in v4">]
         let ByField(tableName, field, fieldNames, sqlProps) =
-            byField tableName field (List.ofSeq fieldNames) sqlProps
+            ByFields(tableName, Any, Seq.singleton field, fieldNames, sqlProps)
         
         /// Remove fields from documents via a JSON containment query (@>)
         [<CompiledName "FSharpByContains">]
@@ -719,13 +831,19 @@ module WithProps =
         let byId tableName (docId: 'TKey) sqlProps =
             Custom.nonQuery (Query.Delete.byId tableName) [ idParam docId ] sqlProps
 
+        /// Delete documents by matching a JSON field comparison query (->> =)
+        [<CompiledName "FSharpByFields">]
+        let byFields tableName howMatched fields sqlProps =
+            Custom.nonQuery (Query.Delete.byFields tableName howMatched fields) (addFieldParams fields []) sqlProps
+        
         /// Delete documents by matching a JSON field comparison query (->> =)
         [<CompiledName "ByField">]
+        [<System.Obsolete "Use ByFields instead; will be removed in v4">]
         let byField tableName field sqlProps =
-            Custom.nonQuery
+            byFields tableName Any [ field ] sqlProps
-                (Query.Delete.byField tableName field)
+        
-                (addFieldParams [ { field with ParameterName = Some "@field" } ] [])
+        let ByFields(tableName, howMatched, fields, sqlProps) =
-                sqlProps
+            Custom.nonQuery (Query.Delete.ByFields tableName howMatched fields) (AddFields fields []) sqlProps
         
         /// Delete documents by matching a JSON contains query (@>)
         [<CompiledName "ByContains">]
@@ -819,10 +937,20 @@ module Count =
     let all tableName =
         WithProps.Count.all tableName (fromDataSource ())
     
+    /// Count matching documents using a JSON field comparison query (->> =)
+    [<CompiledName "FSharpByFields">]
+    let byFields tableName howMatched fields =
+        WithProps.Count.byFields tableName howMatched fields (fromDataSource ())
+    
     /// Count matching documents using a JSON field comparison query (->> =)
     [<CompiledName "ByField">]
+    [<System.Obsolete "Use ByFields instead; will be removed in v4">]
     let byField tableName field =
-        WithProps.Count.byField tableName field (fromDataSource ())
+        byFields tableName Any [ field ]
+    
+    /// Count matching documents using a JSON field comparison query (->> =)
+    let ByFields(tableName, howMatched, fields) =
+        WithProps.Count.ByFields(tableName, howMatched, fields, fromDataSource ())
     
     /// Count matching documents using a JSON containment query (@>)
     [<CompiledName "ByContains">]
@@ -844,10 +972,20 @@ module Exists =
     let byId tableName docId =
         WithProps.Exists.byId tableName docId (fromDataSource ())
     
+    /// Determine if documents exist using a JSON field comparison query (->> =)
+    [<CompiledName "FSharpByFields">]
+    let byFields tableName howMatched fields =
+        WithProps.Exists.byFields tableName howMatched fields (fromDataSource ())
+    
     /// Determine if documents exist using a JSON field comparison query (->> =)
     [<CompiledName "ByField">]
+    [<System.Obsolete "Use ByFields instead; will be removed in v4">]
     let byField tableName field =
-        WithProps.Exists.byField tableName field (fromDataSource ())
+        byFields tableName Any [ field ]
+    
+    /// Determine if documents exist using a JSON field comparison query (->> =)
+    let ByFields(tableName, howMatched, fields) =
+        WithProps.Exists.ByFields(tableName, howMatched, fields, fromDataSource ())
     
     /// Determine if documents exist using a JSON containment query (@>)
     [<CompiledName "ByContains">]
@@ -883,13 +1021,24 @@ module Find =
         WithProps.Find.ById<'TKey, 'TDoc>(tableName, docId, fromDataSource ())
 
     /// Retrieve documents matching a JSON field comparison query (->> =)
-    [<CompiledName "FSharpByField">]
+    [<CompiledName "FSharpByFields">]
-    let byField<'TDoc> tableName field =
+    let byFields<'TDoc> tableName howMatched fields =
-        WithProps.Find.byField<'TDoc> tableName field (fromDataSource ())
+        WithProps.Find.byFields<'TDoc> tableName howMatched fields (fromDataSource ())
     
     /// Retrieve documents matching a JSON field comparison query (->> =)
+    [<CompiledName "FSharpByField">]
+    [<System.Obsolete "Use byFields instead; will be removed in v4">]
+    let byField<'TDoc> tableName field =
+        byFields<'TDoc> tableName Any [ field ]
+    
+    /// Retrieve documents matching a JSON field comparison query (->> =)
+    let ByFields<'TDoc>(tableName, howMatched, fields) =
+        WithProps.Find.ByFields<'TDoc>(tableName, howMatched, fields, fromDataSource ())
+    
+    /// Retrieve documents matching a JSON field comparison query (->> =)
+    [<System.Obsolete "Use ByFields instead; will be removed in v4">]
     let ByField<'TDoc>(tableName, field) =
-        WithProps.Find.ByField<'TDoc>(tableName, field, fromDataSource ())
+        ByFields<'TDoc>(tableName, Any, Seq.singleton field)
     
     /// Retrieve documents matching a JSON containment query (@>)
     [<CompiledName "FSharpByContains">]
@@ -909,14 +1058,25 @@ module Find =
     let ByJsonPath<'TDoc>(tableName, jsonPath) =
         WithProps.Find.ByJsonPath<'TDoc>(tableName, jsonPath, fromDataSource ())
     
+    /// Retrieve the first document matching a JSON field comparison query (->> =); returns None if not found
+    [<CompiledName "FSharpFirstByFields">]
+    let firstByFields<'TDoc> tableName howMatched fields =
+        WithProps.Find.firstByFields<'TDoc> tableName howMatched fields (fromDataSource ())
+    
     /// Retrieve the first document matching a JSON field comparison query (->> =); returns None if not found
     [<CompiledName "FSharpFirstByField">]
+    [<System.Obsolete "Use firstByFields instead; will be removed in v4">]
     let firstByField<'TDoc> tableName field =
-        WithProps.Find.firstByField<'TDoc> tableName field (fromDataSource ())
+        firstByFields<'TDoc> tableName Any [ field ]
     
     /// Retrieve the first document matching a JSON field comparison query (->> =); returns null if not found
+    let FirstByFields<'TDoc when 'TDoc: null>(tableName, howMatched, fields) =
+        WithProps.Find.FirstByFields<'TDoc>(tableName, howMatched, fields, fromDataSource ())
+    
+    /// Retrieve the first document matching a JSON field comparison query (->> =); returns null if not found
+    [<System.Obsolete "Use FirstByFields instead; will be removed in v4">]
     let FirstByField<'TDoc when 'TDoc: null>(tableName, field) =
-        WithProps.Find.FirstByField<'TDoc>(tableName, field, fromDataSource ())
+        FirstByFields<'TDoc>(tableName, Any, Seq.singleton field)
     
     /// Retrieve the first document matching a JSON containment query (@>); returns None if not found
     [<CompiledName "FSharpFirstByContains">]
@@ -965,10 +1125,20 @@ module Patch =
     let byId tableName (docId: 'TKey) (patch: 'TPatch) =
         WithProps.Patch.byId tableName docId patch (fromDataSource ())
     
+    /// Patch documents using a JSON field comparison query in the WHERE clause (->> =)
+    [<CompiledName "FSharpByFields">]
+    let byFields tableName howMatched fields (patch: 'TPatch) =
+        WithProps.Patch.byFields tableName howMatched fields patch (fromDataSource ())
+    
     /// Patch documents using a JSON field comparison query in the WHERE clause (->> =)
     [<CompiledName "ByField">]
+    [<System.Obsolete "Use ByFields instead; will be removed in v4">]
     let byField tableName field (patch: 'TPatch) =
-        WithProps.Patch.byField tableName field patch (fromDataSource ())
+        byFields tableName Any [ field ] patch
+    
+    /// Patch documents using a JSON field comparison query in the WHERE clause (->> =)
+    let ByFields(tableName, howMatched, fields, patch: 'TPatch) =
+        WithProps.Patch.ByFields(tableName, howMatched, fields, patch, fromDataSource ())
     
     /// Patch documents using a JSON containment query in the WHERE clause (@>)
     [<CompiledName "ByContains">]
@@ -994,14 +1164,25 @@ module RemoveFields =
     let ById(tableName, docId: 'TKey, fieldNames) =
         WithProps.RemoveFields.ById(tableName, docId, fieldNames, fromDataSource ())
     
-    /// Remove fields from documents via a comparison on a JSON field in the document
+    /// Remove fields from documents via a comparison on JSON fields in the document
-    [<CompiledName "FSharpByField">]
+    [<CompiledName "FSharpByFields">]
-    let byField tableName field fieldNames =
+    let byFields tableName howMatched fields fieldNames =
-        WithProps.RemoveFields.byField tableName field fieldNames (fromDataSource ())
+        WithProps.RemoveFields.byFields tableName howMatched fields fieldNames (fromDataSource ())
     
     /// Remove fields from documents via a comparison on a JSON field in the document
+    [<CompiledName "FSharpByField">]
+    [<System.Obsolete "Use byFields instead; will be removed in v4">]
+    let byField tableName field fieldNames =
+        byFields tableName Any [ field ] fieldNames
+    
+    /// Remove fields from documents via a comparison on JSON fields in the document
+    let ByFields(tableName, howMatched, fields, fieldNames) =
+        WithProps.RemoveFields.ByFields(tableName, howMatched, fields, fieldNames, fromDataSource ())
+    
+    /// Remove fields from documents via a comparison on a JSON field in the document
+    [<System.Obsolete "Use ByFields instead; will be removed in v4">]
     let ByField(tableName, field, fieldNames) =
-        WithProps.RemoveFields.ByField(tableName, field, fieldNames, fromDataSource ())
+        ByFields(tableName, Any, Seq.singleton field, fieldNames)
     
     /// Remove fields from documents via a JSON containment query (@>)
     [<CompiledName "FSharpByContains">]
@@ -1031,10 +1212,20 @@ module Delete =
     let byId tableName (docId: 'TKey) =
         WithProps.Delete.byId tableName docId (fromDataSource ())
     
+    /// Delete documents by matching a JSON field comparison query (->> =)
+    [<CompiledName "FSharpByFields">]
+    let byFields tableName howMatched fields =
+        WithProps.Delete.byFields tableName howMatched fields (fromDataSource ())
+    
     /// Delete documents by matching a JSON field comparison query (->> =)
     [<CompiledName "ByField">]
+    [<System.Obsolete "Use ByFields instead; will be removed in v4">]
     let byField tableName field =
-        WithProps.Delete.byField tableName field (fromDataSource ())
+        byFields tableName Any [ field ]
+    
+    /// Delete documents by matching a JSON field comparison query (->> =)
+    let ByFields(tableName, howMatched, fields) =
+        WithProps.Delete.ByFields(tableName, howMatched, fields, fromDataSource ())
     
     /// Delete documents by matching a JSON containment query (@>)
     [<CompiledName "ByContains">]

src/Sqlite/Library.fs

@@ -33,7 +33,7 @@ module Query =
     
     /// Create a WHERE clause fragment to implement a comparison on fields in a JSON document
     [<CompiledName "FSharpWhereByFields">]
-    let whereByFields fields howMatched =
+    let whereByFields howMatched fields =
         let name = ParameterName()
         fields
         |> List.map (fun it ->
@@ -46,19 +46,19 @@ module Query =
         |> String.concat (match howMatched with Any -> " OR " | All -> " AND ")
 
     /// Create a WHERE clause fragment to implement a comparison on fields in a JSON document
-    let WhereByFields(fields: Field seq, howMatched) =
+    let WhereByFields(howMatched, fields: Field seq) =
-        whereByFields (List.ofSeq fields) howMatched
+        whereByFields howMatched (List.ofSeq fields)
 
     /// Create a WHERE clause fragment to implement a comparison on a field in a JSON document
     [<CompiledName "WhereByField">]
     [<System.Obsolete "Use WhereByFields instead; will be removed in v4">]
     let whereByField field paramName =
-        whereByFields [ { field with ParameterName = Some paramName } ] Any
+        whereByFields Any [ { field with ParameterName = Some paramName } ]
     
     /// Create a WHERE clause fragment to implement an ID-based query
     [<CompiledName "WhereById">]
     let whereById paramName =
-        whereByFields [ { Field.EQ (Configuration.idField ()) 0 with ParameterName = Some paramName } ] Any
+        whereByFields Any [ { Field.EQ (Configuration.idField ()) 0 with ParameterName = Some paramName } ]
     
     /// Data definition
     module Definition =
@@ -84,7 +84,7 @@ module Query =
         /// Query to count matching documents using a text comparison on a JSON field
         [<CompiledName "ByField">]
         let byField tableName field =
-            whereByFields [ { field with ParameterName = Some "@field" } ] Any
+            whereByFields Any [ { field with ParameterName = Some "@field" } ]
             |> sprintf "SELECT COUNT(*) AS it FROM %s WHERE %s" tableName
         
     /// Queries for determining document existence
@@ -98,7 +98,7 @@ module Query =
         /// Query to determine if documents exist using a comparison on a JSON field
         [<CompiledName "ByField">]
         let byField tableName field =
-            whereByFields [ { field with ParameterName = Some "@field" } ] Any
+            whereByFields Any [ { field with ParameterName = Some "@field" } ]
             |> sprintf "SELECT EXISTS (SELECT 1 FROM %s WHERE %s) AS it" tableName
         
     /// Queries for retrieving documents
@@ -112,7 +112,7 @@ module Query =
         /// Query to retrieve documents using a comparison on a JSON field
         [<CompiledName "ByField">]
         let byField tableName field =
-            whereByFields [ { field with ParameterName = Some "@field" } ] Any
+            whereByFields Any [ { field with ParameterName = Some "@field" } ]
             |> sprintf "%s WHERE %s" (Query.selectFromTable tableName)
         
     /// Document patching (partial update) queries
@@ -130,7 +130,7 @@ module Query =
         /// Query to patch (partially update) a document via a comparison on a JSON field
         [<CompiledName "ByField">]
         let byField tableName field =
-            whereByFields [ { field with ParameterName = Some "@field" } ] Any |> update tableName
+            whereByFields Any [ { field with ParameterName = Some "@field" } ] |> update tableName
     
     /// Queries to remove fields from documents
     module RemoveFields =
@@ -152,7 +152,7 @@ module Query =
         /// Query to remove fields from documents via a comparison on a JSON field within the document
         [<CompiledName "FSharpByField">]
         let byField tableName field parameters =
-            whereByFields [ { field with ParameterName = Some "@field" } ] Any |> update tableName parameters
+            whereByFields Any [ { field with ParameterName = Some "@field" } ] |> update tableName parameters
         
         /// Query to remove fields from documents via a comparison on a JSON field within the document
         let ByField(tableName, field, parameters) =
@@ -169,7 +169,7 @@ module Query =
         /// Query to delete documents using a comparison on a JSON field
         [<CompiledName "ByField">]
         let byField tableName field =
-            whereByFields [ { field with ParameterName = Some "@field" } ] Any
+            whereByFields Any [ { field with ParameterName = Some "@field" } ]
             |> sprintf "DELETE FROM %s WHERE %s" tableName
         
 

src/Tests.CSharp/PostgresCSharpTests.cs

@@ -64,48 +64,48 @@ public static class PostgresCSharpTests
                 TestCase("succeeds for a single field when a logical operator is passed", () =>
                 {
                     Expect.equal(
-                        Postgres.Query.WhereByFields([Field.GT("theField", 0).WithParameterName("@test")],
+                        Postgres.Query.WhereByFields(FieldMatch.Any,
-                            FieldMatch.Any),
+                            [Field.GT("theField", 0).WithParameterName("@test")]),
                         "data->>'theField' > @test", "WHERE clause not correct");
                 }),
                 TestCase("succeeds for a single field when an existence operator is passed", () =>
                 {
-                    Expect.equal(Postgres.Query.WhereByFields([Field.NEX("thatField")], FieldMatch.Any),
+                    Expect.equal(Postgres.Query.WhereByFields(FieldMatch.Any, [Field.NEX("thatField")]),
                         "data->>'thatField' IS NULL", "WHERE clause not correct");
                 }),
                 TestCase("succeeds for a single field when a between operator is passed with numeric values", () =>
                 {
                     Expect.equal(
-                        Postgres.Query.WhereByFields([Field.BT("aField", 50, 99).WithParameterName("@range")],
+                        Postgres.Query.WhereByFields(FieldMatch.All,
-                            FieldMatch.All),
+                            [Field.BT("aField", 50, 99).WithParameterName("@range")]),
                         "(data->>'aField')::numeric BETWEEN @rangemin AND @rangemax", "WHERE clause not correct");
                 }),
                 TestCase("succeeds for a single field when a between operator is passed with non-numeric values", () =>
                 {
                     Expect.equal(
-                        Postgres.Query.WhereByFields([Field.BT("field0", "a", "b").WithParameterName("@alpha")],
+                        Postgres.Query.WhereByFields(FieldMatch.Any,
-                            FieldMatch.Any),
+                            [Field.BT("field0", "a", "b").WithParameterName("@alpha")]),
                         "data->>'field0' BETWEEN @alphamin AND @alphamax", "WHERE clause not correct");
                 }),
                 TestCase("succeeds for all multiple fields with logical operators", () =>
                 {
                     Expect.equal(
-                        Postgres.Query.WhereByFields([Field.EQ("theFirst", "1"), Field.EQ("numberTwo", "2")],
+                        Postgres.Query.WhereByFields(FieldMatch.All,
-                            FieldMatch.All),
+                            [Field.EQ("theFirst", "1"), Field.EQ("numberTwo", "2")]),
                         "data->>'theFirst' = @field0 AND data->>'numberTwo' = @field1", "WHERE clause not correct");
                 }),
                 TestCase("succeeds for any multiple fields with an existence operator", () =>
                 {
                     Expect.equal(
-                        Postgres.Query.WhereByFields([Field.NEX("thatField"), Field.GE("thisField", 18)],
+                        Postgres.Query.WhereByFields(FieldMatch.Any,
-                            FieldMatch.Any),
+                            [Field.NEX("thatField"), Field.GE("thisField", 18)]),
                         "data->>'thatField' IS NULL OR data->>'thisField' >= @field0", "WHERE clause not correct");
                 }),
                 TestCase("succeeds for all multiple fields with between operators", () =>
                 {
                     Expect.equal(
-                        Postgres.Query.WhereByFields([Field.BT("aField", 50, 99), Field.BT("anotherField", "a", "b")],
+                        Postgres.Query.WhereByFields(FieldMatch.All,
-                            FieldMatch.All),
+                            [Field.BT("aField", 50, 99), Field.BT("anotherField", "a", "b")]),
                         "(data->>'aField')::numeric BETWEEN @field0min AND @field0max AND data->>'anotherField' BETWEEN @field1min AND @field1max",
                         "WHERE clause not correct");
                 })
@@ -186,7 +186,7 @@ public static class PostgresCSharpTests
                 TestCase("ByField succeeds", () =>
                 {
                     Expect.equal(Postgres.Query.Count.ByField(PostgresDb.TableName, Field.EQ("thatField", 0)),
-                        $"SELECT COUNT(*) AS it FROM {PostgresDb.TableName} WHERE data->>'thatField' = @field",
+                        $"SELECT COUNT(*) AS it FROM {PostgresDb.TableName} WHERE data->>'thatField' = @field0",
                         "JSON field text comparison count query not correct");
                 }),
                 TestCase("ByContains succeeds", () =>
@@ -213,7 +213,7 @@ public static class PostgresCSharpTests
                 TestCase("ByField succeeds", () =>
                 {
                     Expect.equal(Postgres.Query.Exists.ByField(PostgresDb.TableName, Field.LT("Test", 0)),
-                        $"SELECT EXISTS (SELECT 1 FROM {PostgresDb.TableName} WHERE data->>'Test' < @field) AS it",
+                        $"SELECT EXISTS (SELECT 1 FROM {PostgresDb.TableName} WHERE data->>'Test' < @field0) AS it",
                         "JSON field text comparison exists query not correct");
                 }),
                 TestCase("ByContains succeeds", () =>
@@ -240,7 +240,7 @@ public static class PostgresCSharpTests
                 TestCase("ByField succeeds", () =>
                 {
                     Expect.equal(Postgres.Query.Find.ByField(PostgresDb.TableName, Field.GE("Golf", 0)),
-                        $"SELECT data FROM {PostgresDb.TableName} WHERE data->>'Golf' >= @field",
+                        $"SELECT data FROM {PostgresDb.TableName} WHERE data->>'Golf' >= @field0",
                         "SELECT by JSON comparison query not correct");
                 }),
                 TestCase("byContains succeeds", () =>
@@ -267,7 +267,7 @@ public static class PostgresCSharpTests
                 TestCase("ByField succeeds", () =>
                 {
                     Expect.equal(Postgres.Query.Patch.ByField(PostgresDb.TableName, Field.LT("Snail", 0)),
-                        $"UPDATE {PostgresDb.TableName} SET data = data || @data WHERE data->>'Snail' < @field",
+                        $"UPDATE {PostgresDb.TableName} SET data = data || @data WHERE data->>'Snail' < @field0",
                         "UPDATE partial by ID statement not correct");
                 }),
                 TestCase("ByContains succeeds", () =>
@@ -294,7 +294,7 @@ public static class PostgresCSharpTests
                 TestCase("ByField succeeds", () =>
                 {
                     Expect.equal(Postgres.Query.RemoveFields.ByField(PostgresDb.TableName, Field.LT("Fly", 0)),
-                        $"UPDATE {PostgresDb.TableName} SET data = data - @name WHERE data->>'Fly' < @field",
+                        $"UPDATE {PostgresDb.TableName} SET data = data - @name WHERE data->>'Fly' < @field0",
                         "Remove field by field query not correct");
                 }),
                 TestCase("ByContains succeeds", () =>

src/Tests.CSharp/SqliteCSharpTests.cs

@@ -25,41 +25,40 @@ public static class SqliteCSharpTests
                 TestCase("succeeds for a single field when a logical operator is passed", () =>
                 {
                     Expect.equal(
-                        Sqlite.Query.WhereByFields([Field.GT("theField", 0).WithParameterName("@test")],
+                        Sqlite.Query.WhereByFields(FieldMatch.Any,
-                            FieldMatch.Any),
+                            [Field.GT("theField", 0).WithParameterName("@test")]),
                         "data->>'theField' > @test", "WHERE clause not correct");
                 }),
                 TestCase("succeeds for a single field when an existence operator is passed", () =>
                 {
-                    Expect.equal(Sqlite.Query.WhereByFields([Field.NEX("thatField")], FieldMatch.Any),
+                    Expect.equal(Sqlite.Query.WhereByFields(FieldMatch.Any, [Field.NEX("thatField")]),
                         "data->>'thatField' IS NULL", "WHERE clause not correct");
                 }),
                 TestCase("succeeds for a single field when a between operator is passed", () =>
                 {
                     Expect.equal(
-                        Sqlite.Query.WhereByFields([Field.BT("aField", 50, 99).WithParameterName("@range")],
+                        Sqlite.Query.WhereByFields(FieldMatch.All,
-                            FieldMatch.All),
+                            [Field.BT("aField", 50, 99).WithParameterName("@range")]),
                         "data->>'aField' BETWEEN @rangemin AND @rangemax", "WHERE clause not correct");
                 }),
                 TestCase("succeeds for all multiple fields with logical operators", () =>
                 {
                     Expect.equal(
-                        Sqlite.Query.WhereByFields([Field.EQ("theFirst", "1"), Field.EQ("numberTwo", "2")],
+                        Sqlite.Query.WhereByFields(FieldMatch.All,
-                            FieldMatch.All),
+                            [Field.EQ("theFirst", "1"), Field.EQ("numberTwo", "2")]),
                         "data->>'theFirst' = @field0 AND data->>'numberTwo' = @field1", "WHERE clause not correct");
                 }),
                 TestCase("succeeds for any multiple fields with an existence operator", () =>
                 {
                     Expect.equal(
-                        Sqlite.Query.WhereByFields([Field.NEX("thatField"), Field.GE("thisField", 18)],
+                        Sqlite.Query.WhereByFields(FieldMatch.Any, [Field.NEX("thatField"), Field.GE("thisField", 18)]),
-                            FieldMatch.Any),
                         "data->>'thatField' IS NULL OR data->>'thisField' >= @field0", "WHERE clause not correct");
                 }),
                 TestCase("succeeds for all multiple fields with between operators", () =>
                 {
                     Expect.equal(
-                        Sqlite.Query.WhereByFields([Field.BT("aField", 50, 99), Field.BT("anotherField", "a", "b")],
+                        Sqlite.Query.WhereByFields(FieldMatch.All,
-                            FieldMatch.All),
+                            [Field.BT("aField", 50, 99), Field.BT("anotherField", "a", "b")]),
                         "data->>'aField' BETWEEN @field0min AND @field0max AND data->>'anotherField' BETWEEN @field1min AND @field1max",
                         "WHERE clause not correct");
                 })

src/Tests/PostgresTests.fs

@@ -61,43 +61,43 @@ let unitTests =
             testList "whereByFields" [
                 test "succeeds for a single field when a logical operator is passed" {
                     Expect.equal
-                        (Query.whereByFields [ { Field.GT "theField" 0 with ParameterName = Some "@test" } ] Any)
+                        (Query.whereByFields Any [ { Field.GT "theField" 0 with ParameterName = Some "@test" } ])
                         "data->>'theField' > @test"
                         "WHERE clause not correct"
                 }
                 test "succeeds for a single field when an existence operator is passed" {
                     Expect.equal
-                        (Query.whereByFields [ Field.NEX "thatField" ] Any)
+                        (Query.whereByFields Any [ Field.NEX "thatField" ])
                         "data->>'thatField' IS NULL"
                         "WHERE clause not correct"
                 }
                 test "succeeds for a single field when a between operator is passed with numeric values" {
                     Expect.equal
-                        (Query.whereByFields [ { Field.BT "aField" 50 99 with ParameterName = Some "@range" } ] All)
+                        (Query.whereByFields All [ { Field.BT "aField" 50 99 with ParameterName = Some "@range" } ])
                         "(data->>'aField')::numeric BETWEEN @rangemin AND @rangemax"
                         "WHERE clause not correct"
                 }
                 test "succeeds for a single field when a between operator is passed with non-numeric values" {
                     Expect.equal
-                        (Query.whereByFields [ { Field.BT "field0" "a" "b" with ParameterName = Some "@alpha" } ] Any)
+                        (Query.whereByFields Any [ { Field.BT "field0" "a" "b" with ParameterName = Some "@alpha" } ])
                         "data->>'field0' BETWEEN @alphamin AND @alphamax"
                         "WHERE clause not correct"
                 }
                 test "succeeds for all multiple fields with logical operators" {
                     Expect.equal
-                        (Query.whereByFields [ Field.EQ "theFirst" "1"; Field.EQ "numberTwo" "2" ] All)
+                        (Query.whereByFields All [ Field.EQ "theFirst" "1"; Field.EQ "numberTwo" "2" ])
                         "data->>'theFirst' = @field0 AND data->>'numberTwo' = @field1"
                         "WHERE clause not correct"
                 }
                 test "succeeds for any multiple fields with an existence operator" {
                     Expect.equal
-                        (Query.whereByFields [ Field.NEX "thatField"; Field.GE "thisField" 18 ] Any)
+                        (Query.whereByFields Any [ Field.NEX "thatField"; Field.GE "thisField" 18 ])
                         "data->>'thatField' IS NULL OR data->>'thisField' >= @field0"
                         "WHERE clause not correct"
                 }
                 test "succeeds for all multiple fields with between operators" {
                     Expect.equal
-                        (Query.whereByFields [ Field.BT "aField" 50 99; Field.BT "anotherField" "a" "b" ] All)
+                        (Query.whereByFields All [ Field.BT "aField" 50 99; Field.BT "anotherField" "a" "b" ])
                         "(data->>'aField')::numeric BETWEEN @field0min AND @field0max AND data->>'anotherField' BETWEEN @field1min AND @field1max"
                         "WHERE clause not correct"
                 }
@@ -174,7 +174,7 @@ let unitTests =
                 test "byField succeeds" {
                     Expect.equal
                         (Query.Count.byField PostgresDb.TableName (Field.EQ "thatField" 0))
-                        $"SELECT COUNT(*) AS it FROM {PostgresDb.TableName} WHERE data->>'thatField' = @field"
+                        $"SELECT COUNT(*) AS it FROM {PostgresDb.TableName} WHERE data->>'thatField' = @field0"
                         "JSON field text comparison count query not correct"
                 }
                 test "byContains succeeds" {
@@ -200,7 +200,7 @@ let unitTests =
                 test "byField succeeds" {
                     Expect.equal
                         (Query.Exists.byField PostgresDb.TableName (Field.LT "Test" 0))
-                        $"SELECT EXISTS (SELECT 1 FROM {PostgresDb.TableName} WHERE data->>'Test' < @field) AS it"
+                        $"SELECT EXISTS (SELECT 1 FROM {PostgresDb.TableName} WHERE data->>'Test' < @field0) AS it"
                         "JSON field text comparison exists query not correct"
                 }
                 test "byContains succeeds" {
@@ -226,7 +226,7 @@ let unitTests =
                 test "byField succeeds" {
                     Expect.equal
                         (Query.Find.byField PostgresDb.TableName (Field.GE "Golf" 0))
-                        $"SELECT data FROM {PostgresDb.TableName} WHERE data->>'Golf' >= @field"
+                        $"SELECT data FROM {PostgresDb.TableName} WHERE data->>'Golf' >= @field0"
                         "SELECT by JSON comparison query not correct"
                 }
                 test "byContains succeeds" {
@@ -252,7 +252,7 @@ let unitTests =
                 test "byField succeeds" {
                     Expect.equal
                         (Query.Patch.byField PostgresDb.TableName (Field.LT "Snail" 0))
-                        $"UPDATE {PostgresDb.TableName} SET data = data || @data WHERE data->>'Snail' < @field"
+                        $"UPDATE {PostgresDb.TableName} SET data = data || @data WHERE data->>'Snail' < @field0"
                         "UPDATE partial by ID statement not correct"
                 }
                 test "byContains succeeds" {
@@ -278,7 +278,7 @@ let unitTests =
                 test "byField succeeds" {
                     Expect.equal
                         (Query.RemoveFields.byField "tbl" (Field.LT "Fly" 0))
-                        "UPDATE tbl SET data = data - @name WHERE data->>'Fly' < @field"
+                        "UPDATE tbl SET data = data - @name WHERE data->>'Fly' < @field0"
                         "Remove field by field query not correct"
                 }
                 test "byContains succeeds" {

src/Tests/SqliteTests.fs

@@ -15,37 +15,37 @@ let unitTests =
             testList "whereByFields" [
                 test "succeeds for a single field when a logical operator is passed" {
                     Expect.equal
-                        (Query.whereByFields [ { Field.GT "theField" 0 with ParameterName = Some "@test" } ] Any)
+                        (Query.whereByFields Any [ { Field.GT "theField" 0 with ParameterName = Some "@test" } ])
                         "data->>'theField' > @test"
                         "WHERE clause not correct"
                 }
                 test "succeeds for a single field when an existence operator is passed" {
                     Expect.equal
-                        (Query.whereByFields [ Field.NEX "thatField" ] Any)
+                        (Query.whereByFields Any [ Field.NEX "thatField" ])
                         "data->>'thatField' IS NULL"
                         "WHERE clause not correct"
                 }
                 test "succeeds for a single field when a between operator is passed" {
                     Expect.equal
-                        (Query.whereByFields [ { Field.BT "aField" 50 99 with ParameterName = Some "@range" } ] All)
+                        (Query.whereByFields All [ { Field.BT "aField" 50 99 with ParameterName = Some "@range" } ])
                         "data->>'aField' BETWEEN @rangemin AND @rangemax"
                         "WHERE clause not correct"
                 }
                 test "succeeds for all multiple fields with logical operators" {
                     Expect.equal
-                        (Query.whereByFields [ Field.EQ "theFirst" "1"; Field.EQ "numberTwo" "2" ] All)
+                        (Query.whereByFields All [ Field.EQ "theFirst" "1"; Field.EQ "numberTwo" "2" ])
                         "data->>'theFirst' = @field0 AND data->>'numberTwo' = @field1"
                         "WHERE clause not correct"
                 }
                 test "succeeds for any multiple fields with an existence operator" {
                     Expect.equal
-                        (Query.whereByFields [ Field.NEX "thatField"; Field.GE "thisField" 18 ] Any)
+                        (Query.whereByFields Any [ Field.NEX "thatField"; Field.GE "thisField" 18 ])
                         "data->>'thatField' IS NULL OR data->>'thisField' >= @field0"
                         "WHERE clause not correct"
                 }
                 test "succeeds for all multiple fields with between operators" {
                     Expect.equal
-                        (Query.whereByFields [ Field.BT "aField" 50 99; Field.BT "anotherField" "a" "b" ] All)
+                        (Query.whereByFields All [ Field.BT "aField" 50 99; Field.BT "anotherField" "a" "b" ])
                         "data->>'aField' BETWEEN @field0min AND @field0max AND data->>'anotherField' BETWEEN @field1min AND @field1max"
                         "WHERE clause not correct"
                 }