Fix string betweens

Author: abnegate

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

@@ -24,7 +24,7 @@ class Query {
 
     fun between(attribute: String, start: Double, end: Double) = "between(\"${attribute}\", ${start}, ${end})"
 
-    fun between(attribute: String, start: String, end: String) = "between(\"${attribute}\", ${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,7 +47,8 @@ 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) => 'between("$attribute", $start, $end)'
+  static String between(String attribute, dynamic start, dynamic end) =>
+      'between("$attribute", ${_parseValues(start)}, ${_parseValues(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}", ${start}, ${end})`;
+    `between("${attribute}", ${Query.parseValues(start)}, ${Query.parseValues(end)})`;
 
   static startsWith = (attribute: string, value: string): string =>
     Query.addQuery(attribute, "startsWith", value);

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

@@ -63,7 +63,7 @@ namespace Appwrite
 
         public static string Between(string attribute, string start, string end)
         {
-            return $"between(\"{attribute}\", {start}, {end})";
+            return $"between(\"{attribute}\", \"{start}\", \"{end}\")";
         }
 
         public static string Between(string attribute, int start, int end)

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

@@ -24,7 +24,7 @@ class Query {
 
     fun between(attribute: String, start: Double, end: Double) = "between(\"${attribute}\", ${start}, ${end})"
 
-    fun between(attribute: String, start: String, end: String) = "between(\"${attribute}\", ${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) =>
-    `between("${attribute}", ${start}, ${end})`
+    `between("${attribute}", ${Query.parseValues(start)}, ${Query.parseValues(end)})`
 
   static startsWith = (attribute, value) =>
     Query.addQuery(attribute, "startsWith", value);

templates/php/src/Query.php.twig

@@ -120,6 +120,9 @@ class Query
      */
     public static function between(string $attribute, $start, $end): string
     {
+        $start = self::parseValues($start);
+        $end = self::parseValues($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 f'between("{attribute}", {start}, {end})'
+        return f'between("{attribute}", {Query.parseValues(start)}, {Query.parseValues(end)})'
 
     @staticmethod
     def starts_with(attribute, value):

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

@@ -34,7 +34,7 @@ module {{spec.title | caseUcfirst}}
             end
 
             def between(attribute, start, end)
-                return "between(\"#{attribute}\", #{start}, #{end})"
+                return "between(\"#{attribute}\", #{parse_values(start)}, #{parse_values(end)})"
             end
 
             def starts_with(attribute, value)
@@ -81,13 +81,13 @@ module {{spec.title | caseUcfirst}}
 
             def add_query(attribute, method, value)
                 if value.is_a?(Array)
-                    "#{method}(\"#{attribute}\", [#{value.map {|item| parseValues(item)}.join(',')}])"
+                    "#{method}(\"#{attribute}\", [#{value.map {|item| parse_values(item)}.join(',')}])"
                 else
-                   return "#{method}(\"#{attribute}\", [#{parseValues(value)}])"
+                   return "#{method}(\"#{attribute}\", [#{parse_values(value)}])"
 				end
             end
 
-            def parseValues(value)
+            def parse_values(value)
                 return value.is_a?(String) ? "\"#{value}\"" : value
             end
         end

templates/swift/Sources/Query.swift.twig

@@ -41,7 +41,7 @@ public class Query {
     }
 
     public static func between(_ attribute: String, start: String, end: String) -> String {
-        "between(\"\(attribute)\", \(start), \(end))"
+        "between(\"\(attribute)\", \"\(start)\", \"\(end)\")"
     }
 
     public static func startsWith(_ attribute: String, value: String) -> String {

templates/web/src/query.ts.twig

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