Fix between query output

Author: abnegate

templates/android/library/src/main/java/io/appwrite/Query.kt.twig

@@ -20,11 +20,11 @@ class Query {
 
     fun isNotNull(attribute: String) = "isNotNull(\"${attribute}\")"
 
-    fun between(attribute: String, start: Int, end: Int) = Query.addQuery(attribute, "between", listOf(start, end))
+    fun between(attribute: String, start: Int, end: Int) = "between(\"${attribute}\", ${start}, ${end})"
 
-    fun between(attribute: String, start: Double, end: Double) = Query.addQuery(attribute, "between", listOf(start, end))
+    fun between(attribute: String, start: Double, end: Double) = "between(\"${attribute}\", ${start}, ${end})"
 
-    fun between(attribute: String, start: String, end: String) = Query.addQuery(attribute, "between", listOf(start, end))
+    fun between(attribute: String, start: String, end: String) = "between(\"${attribute}\", ${start}, ${end})"
 
     fun startsWith(attribute: String, value: String) = Query.addQuery(attribute, "startsWith", value)
 

templates/dart/lib/query.dart.twig

@@ -47,8 +47,7 @@ class Query {
   static String isNotNull(String attribute) => 'isNotNull("$attribute")';
 
   /// Filter resources where [attribute] is between [start] and [end] (inclusive).
-  static String between(String attribute, dynamic start, dynamic end) =>
-      _addQuery(attribute, 'between', [start, end]);
+  static String between(String attribute, dynamic start, dynamic end) => 'between("$attribute", $start, $end)'
 
   /// Filter resources where [attribute] starts with [value].
   static String startsWith(String attribute, String value) =>

templates/deno/src/query.ts.twig

@@ -31,7 +31,7 @@ export class Query {
     `isNotNull("${attribute}")`;
 
   static between = (attribute: string, start: string|number, end: string|number): string =>
-    `between("${attribute}", [${Query.parseValues(start)},${Query.parseValues(end)}])`;
+    `between("${attribute}", ${start}, ${end})`;
 
   static startsWith = (attribute: string, value: string): string =>
     Query.addQuery(attribute, "startsWith", value);

templates/dotnet/src/Appwrite/Query.cs.twig

@@ -63,17 +63,17 @@ namespace Appwrite
 
         public static string Between(string attribute, string start, string end)
         {
-            return AddQuery(attribute, "between", new List<string> { start, end });
+            return $"between(\"{attribute}\", {start}, {end})";
         }
 
         public static string Between(string attribute, int start, int end)
         {
-            return AddQuery(attribute, "between", new List<int> { start, end });
+            return $"between(\"{attribute}\", {start}, {end})";
         }
 
         public static string Between(string attribute, double start, double end)
         {
-            return AddQuery(attribute, "between", new List<double> { start, end });
+            return $"between(\"{attribute}\", {start}, {end})";
         }
 
         public static string Select(List<string> attributes)

templates/kotlin/src/main/kotlin/io/appwrite/Query.kt.twig

@@ -20,11 +20,11 @@ class Query {
 
     fun isNotNull(attribute: String) = "isNotNull(\"${attribute}\")"
 
-    fun between(attribute: String, start: Int, end: Int) = Query.addQuery(attribute, "between", listOf(start, end))
+    fun between(attribute: String, start: Int, end: Int) = "between(\"${attribute}\", ${start}, ${end})"
 
-    fun between(attribute: String, start: Double, end: Double) = Query.addQuery(attribute, "between", listOf(start, end))
+    fun between(attribute: String, start: Double, end: Double) = "between(\"${attribute}\", ${start}, ${end})"
 
-    fun between(attribute: String, start: String, end: String) = Query.addQuery(attribute, "between", listOf(start, end))
+    fun between(attribute: String, start: String, end: String) = "between(\"${attribute}\", ${start}, ${end})"
 
     fun startsWith(attribute: String, value: String) = Query.addQuery(attribute, "startsWith", value)
 

templates/node/lib/query.js.twig

@@ -24,7 +24,7 @@ class Query {
     `isNotNull("${attribute}")`;
 
   static between = (attribute, start, end) =>
-    Query.addQuery(attribute, "between", [start, end]);
+    `between("${attribute}", ${start}, ${end})`
 
   static startsWith = (attribute, value) =>
     Query.addQuery(attribute, "startsWith", value);

templates/php/src/Query.php.twig

@@ -120,7 +120,7 @@ class Query
      */
     public static function between(string $attribute, $start, $end): string
     {
-        return self::addQuery($attribute, 'between', [$start, $end]);
+        return "between(\"{$attribute}\", {$start}, {$end})";
     }
 
     /**

templates/python/package/query.py.twig

@@ -33,7 +33,7 @@ class Query:
 
     @staticmethod
     def between(attribute, start, end):
-        return Query.add_query(attribute, "between", [start, end])
+        return f'between("{attribute}", {start}, {end})'
 
     @staticmethod
     def starts_with(attribute, value):

templates/ruby/lib/container/query.rb.twig

@@ -33,8 +33,8 @@ module {{spec.title | caseUcfirst}}
                 return "isNotNull(\"#{attribute}\")"
             end
 
-            def between(attribute, start, ending)
-                return add_query(attribute, "between", [start, ending])
+            def between(attribute, start, end)
+                return "between(\"#{attribute}\", #{start}, #{end})"
             end
 
             def starts_with(attribute, value)

templates/swift/Sources/Query.swift.twig

@@ -33,15 +33,15 @@ public class Query {
     }
 
     public static func between(_ attribute: String, start: Int, end: Int) -> String {
-        buildQueryWhere(attribute, is: "between", to: [start, end])
+        "between(\"\(attribute)\", \(start), \(end))"
     }
 
     public static func between(_ attribute: String, start: Double, end: Double) -> String {
-        buildQueryWhere(attribute, is: "between", to: [start, end])
+        "between(\"\(attribute)\", \(start), \(end))"
     }
 
     public static func between(_ attribute: String, start: String, end: String) -> String {
-        buildQueryWhere(attribute, is: "between", to: [start, end])
+        "between(\"\(attribute)\", \(start), \(end))"
     }
 
     public static func startsWith(_ attribute: String, value: String) -> String {