- add readAllWhereWithOrder method

Author: Artemiy Garin

src/garin/artemiy/sqlitesimple/library/SQLiteSimple.java

@@ -33,6 +33,7 @@ public class SQLiteSimple {
     private SQLiteSimpleHelper sqLiteSimpleHelper;
     private SimplePreferencesUtil sharedPreferencesUtil;
     private int databaseVersion;
+    private boolean isAddedSQLDivider;
 
     @SuppressWarnings("unused")
     public SQLiteSimple(Context context, int databaseVersion) {
@@ -129,13 +130,15 @@ public void create(Class<?>... classes) {
                         sqlQueryBuilder.append(String.format(SimpleConstants.FORMAT_TWINS,
                                 String.format(SimpleConstants.FORMAT_OBJECT_BRACKET, column),
                                 fieldEntityAnnotation.type()));
+                        isAddedSQLDivider = false;
 
                         if (fieldEntityAnnotation.isAutoincrement()) {
                             sqlQueryBuilder.append(SimpleConstants.SPACE);
                             sqlQueryBuilder.append(SimpleConstants.AUTOINCREMENT);
                         }
 
                         if (annotatedFieldsIndex != tableFieldsCount - 1) {
+                            isAddedSQLDivider = true;
                             sqlQueryBuilder.append(SimpleConstants.DIVIDER);
                             sqlQueryBuilder.append(SimpleConstants.SPACE);
                         }
@@ -184,13 +187,20 @@ private void makeKeyForTable(StringBuilder sqlQueryBuilder, List<Field> primaryK
 
         } else if (primaryKeys.size() == 1) {
 
+            if (!isAddedSQLDivider) {
+                sqlQueryBuilder.append(SimpleConstants.DIVIDER);
+                sqlQueryBuilder.append(SimpleConstants.SPACE);
+            }
+
             Field fieldEntity = primaryKeys.get(0);
             String column = SimpleDatabaseUtil.getColumnName(fieldEntity);
             Column fieldEntityAnnotation = fieldEntity.getAnnotation(Column.class);
             sqlQueryBuilder.append(String.format(SimpleConstants.FORMAT_TWINS,
                     column, fieldEntityAnnotation.type()));
+
             sqlQueryBuilder.append(SimpleConstants.SPACE);
             sqlQueryBuilder.append(SimpleConstants.PRIMARY_KEY);
+
             if (fieldEntityAnnotation.isAutoincrement()) {
                 sqlQueryBuilder.append(SimpleConstants.SPACE);
                 sqlQueryBuilder.append(SimpleConstants.AUTOINCREMENT);

src/garin/artemiy/sqlitesimple/library/SQLiteSimpleDAO.java

@@ -349,6 +349,13 @@ public List<T> readAllWhere(String columnName, String columnValue) {
         return readAll(cursor);
     }
 
+    @SuppressWarnings("unused")
+    public List<T> readAllWhereWithOrder(String columnName, String columnValue, String column, String order) {
+        Cursor cursor = selectCursorFromTable(String.format(SimpleConstants.FORMAT_COLUMN, columnName),
+                new String[]{columnValue}, null, null, String.format(SimpleConstants.FORMAT_TWINS, column, order));
+        return readAll(cursor);
+    }
+
     private List<T> readAll(Cursor cursor) {
         try {
             List<T> list = new ArrayList<T>();