updated new apis for matching column data

p32929 · Apr 17, 2019 · 5bd3c89 · 5bd3c89
1 parent 182cb06
commit 5bd3c89
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ allprojects {
 Add the dependency
 ```
 dependencies {
-     implementation 'com.github.p32929:AndroidEasySQL-Library:1.3.10'
+     implementation 'com.github.p32929:AndroidEasySQL-Library:1.3.11'
 }
 ```
 
@@ -150,11 +150,11 @@ if (res != null) {
 }
 ```
 
-### Get/Read one row data by matching a column data:
-To get data from a row by matching data with a column, call ```getOneRowData(columnNumber, valueToMatchWithTheColumn)``` or ```getOneRowData(columnName, valueToMatchWithTheColumn)```
+### Get/Read/Search one/multiple row data by matching a column data:
+To get data from one/multiple rows by matching data with a column, call ```searchInColumn(columnNumber, valueToSearch, limit)``` or ```searchInColumn(columnName, valueToSearch, limit)```
 example:
 ```
-Cursor res = easyDB.getOneRowData(1, "data");
+Cursor res = easyDB.searchInColumn(1, "data", 1); // Here we passed limit = 1. Thus it will return only one row data with the matched column value
 if (res != null) {
     res.moveToFirst(); // Because here's only one row data
     String ID = res.getString(0); // Column 0 is the ID column
@@ -166,15 +166,18 @@ if (res != null) {
 or
 
 ```
-Cursor res = easyDB.getOneRowData("ID", "data");
+Cursor res = easyDB.searchInColumn("ID", "data", -1); // Here we passed limit = -1. Thus it will return all the rows with the matched column values
 if (res != null) {
-    res.moveToFirst(); // Because here's only one row data
-    String ID = res.getString(0); // Column 0 is the ID column
-    String c1 = res.getString(1);
-    String c2 = res.getString(2);
+    while (res.moveToNext()) {
+            String ID = res.getString(0); // Column 0 is the ID column
+            String c1 = res.getString(1);
+            String c2 = res.getString(2);
+    }
 }
 ```
 
+> Please DO NOT pass ```limit = 0``` as the parameter
+
 ### Match data from multiple columns:
 To check if some values exist or not in the database, first call ```getAllColumns()``` to get all the column names like this:
 

diff --git a/androideasysql-library/src/main/java/p32929/androideasysql_library/EasyDB.java b/androideasysql-library/src/main/java/p32929/androideasysql_library/EasyDB.java
@@ -120,6 +120,7 @@ public Cursor getOneRowData(int rowID) {
         }
     }
 
+    @Deprecated
     public Cursor getOneRowData(int columnNumber, String value) {
         if (!initedDb || writableDatabase == null) initDatabase();
         String allColNames[] = new String[columns.size() + 1];
@@ -139,6 +140,7 @@ public Cursor getOneRowData(int columnNumber, String value) {
         }
     }
 
+    @Deprecated
     public Cursor getOneRowData(String columnName, String value) {
         if (!initedDb || writableDatabase == null) initDatabase();
         String allColNames[] = new String[columns.size() + 1];
@@ -158,6 +160,44 @@ public Cursor getOneRowData(String columnName, String value) {
         }
     }
 
+    public Cursor searchInColumn(int columnNumber, String valueToSearch, int limit) {
+        if (!initedDb || writableDatabase == null) initDatabase();
+        String allColNames[] = new String[columns.size() + 1];
+        allColNames[0] = "ID";
+        for (int i = 0; i < columns.size(); i++) {
+            allColNames[i + 1] = columns.get(i).columnName;
+        }
+        Cursor cursor = writableDatabase.query(TABLE_NAME,
+                allColNames, allColNames[columnNumber].toString() + "=?",
+                new String[]{valueToSearch},
+                null, null, null, limit == -1 ? null : String.valueOf(limit));
+
+        if (cursor.getCount() > 0) {
+            return cursor;
+        } else {
+            return null;
+        }
+    }
+
+    public Cursor searchInColumn(String columnName, String valueToSearch, int limit) {
+        if (!initedDb || writableDatabase == null) initDatabase();
+        String allColNames[] = new String[columns.size() + 1];
+        allColNames[0] = "ID";
+        for (int i = 0; i < columns.size(); i++) {
+            allColNames[i + 1] = columns.get(i).columnName;
+        }
+        Cursor cursor = writableDatabase.query(TABLE_NAME,
+                allColNames, " " + columnName + " " + "=?",
+                new String[]{valueToSearch},
+                null, null, null, limit == -1 ? null : String.valueOf(limit));
+
+        if (cursor.getCount() > 0) {
+            return cursor;
+        } else {
+            return null;
+        }
+    }
+
     //
     public boolean matchColumns(String columnsToMatch[], String valuesToMatch[]) {
         String query = "";

diff --git a/app/src/main/java/p32929/databaseeasier/MainActivity.java b/app/src/main/java/p32929/databaseeasier/MainActivity.java
@@ -38,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         easyDB = EasyDB.init(this, "TEST") // TEST is the name of the DATABASE
                 .setTableName("DEMO TABLE")  // You can ignore this line if you want
-                .addColumn(new Column("C1","text", "unique"))
+                .addColumn(new Column("C1", "text"))
                 .addColumn(new Column("C2", "text", "unique"))
                 .doneTableColumn();
 
@@ -149,23 +149,24 @@ private void showData() {
             String c1 = res.getString(1);
             String c2 = res.getString(2);
             tres += "Row: " + row + " C1 = " + c1 + " C2 = " + c2 + "\n";
-
-            textViewResult.setText(tres);
         }
+        textViewResult.setText(tres);
     }
 
     public void getData1(View view) {
         String tres = "";
-        Cursor res = easyDB.getOneRowData(1, "5");
+        Cursor res = easyDB.searchInColumn(1, "1", -1);
+
         if (res != null) {
-            res.moveToFirst();
-
-            String row = res.getString(0);
-            String c1 = res.getString(1);
-            String c2 = res.getString(2);
-            tres += "Row: " + row + " C1 = " + c1 + " C2 = " + c2 + "\n";
+            while (res.moveToNext()) {
+                String row = res.getString(0);
+                String c1 = res.getString(1);
+                String c2 = res.getString(2);
+                tres += "Row: " + row + " C1 = " + c1 + " C2 = " + c2 + "\n";
+            }
 
             textViewResult.setText(tres);
+
         } else {
             Toast.makeText(this, "No Data", Toast.LENGTH_SHORT).show();
         }