Merge remote-tracking branch 'origin/master' into 1.5.x

appwrite · Dec 17, 2023 · c7405b6 · c7405b6
2 parents d2ff5eb + d632700
commit c7405b6
Show file tree

Hide file tree

Showing 20 changed files with 301 additions and 163 deletions.
diff --git a/src/SDK/Language/CLI.php b/src/SDK/Language/CLI.php
@@ -142,6 +142,11 @@ public function getFiles(): array
                 'destination'   => 'lib/config.js',
                 'template'      => 'cli/lib/config.js.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/paginate.js',
+                'template'      => 'cli/lib/paginate.js.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'lib/client.js',

diff --git a/templates/android/library/src/main/java/io/appwrite/Query.kt.twig b/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)