fixed behavior

added more tests

Author: ologe

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release notes
 
+## 1.1.0
+- Fixed multiple `GROUP BY` not working
+- Improved tests
+
 ## 1.0.0
 - Fixed crashed
 - Now is **mandatory** to specify `ORDER BY` when using `LIMIT`

README.md

@@ -63,7 +63,7 @@ val query = """
     SELECT distinct $ARTIST_ID, $ARTIST, count(*) as songs, count(distinct $ALBUM_ID) as albums
     FROM ${Media.EXTERNAL_CONTENT_URI}
     WHERE $IS_PODCAST = 0
-    GROUP BY $ARTIST_ID AND $ARTIST
+    GROUP BY $ARTIST_ID
     HAVING songs >= 5 AND albums >= 2
     ORDER BY $ARTIST_KEY DESC
     LIMIT 10
@@ -81,7 +81,7 @@ contentResolver.query(
         "count(*) as songs", 
         "count(distinct $ALBUM_ID) as albums"
     ),
-    selection = "$IS_PODCAST = 0 ) GROUP BY $ARTIST_ID AND $ARTIST AND HAVING (songs >= 5 AND albums >= 2",
+    selection = "$IS_PODCAST = 0 ) GROUP BY $ARTIST_ID HAVING (songs >= 5 AND albums >= 2",
     selectionArgs = null,
     sortOrder = "$ARTIST_KEY DESC LIMIT 20 OFFSET 2"
 )

app/src/main/java/dev/olog/contentresolversql/example/MainActivity.kt

@@ -13,17 +13,17 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        var start = System.currentTimeMillis()
+        example()
+    }
+
+
+    private fun example(){
         var query = """
             SELECT *
             FROM ${MediaStore.Audio.Media.EXTERNAL_CONTENT_URI}
         """.trimIndent()
 
-        var cursor = contentResolver.querySql(query)
-        cursor.close()
-
-        val time1 = System.currentTimeMillis() - start
-        start = System.currentTimeMillis()
+        contentResolver.querySql(query).close()
 
         query = """
             SELECT distinct $ARTIST_ID, $ARTIST, count(*) as songs, count(distinct $ALBUM_ID) as albums
@@ -36,7 +36,7 @@ class MainActivity : AppCompatActivity() {
             OFFSET 2
         """.trimIndent()
 
-        cursor = contentResolver.querySql(query)
+        val cursor = contentResolver.querySql(query)
         val result = mutableListOf<Artist>()
         while (cursor.moveToNext()){
             val item = Artist(
@@ -48,10 +48,9 @@ class MainActivity : AppCompatActivity() {
             result.add(item)
         }
 
-        val time2 = System.currentTimeMillis() - start
-
         cursor.close()
     }
+
 }
 
 data class Artist(

library/build.gradle

@@ -7,9 +7,9 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        // sdk_version, major, minor, fixes
-        versionCode 28_1_0_10
-        versionName "1.0"
+        // sdk_version, major, minor, patch(1st)beta(2nd)
+        versionCode 28_1_1_0
+        versionName "1.1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"