Fix bugs in indexes.

Author: artbits

README.md

@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.artbits:sqlite-java:1.0.3'
+    implementation 'com.github.artbits:sqlite-java:1.0.4'
 }
 ```
 Maven:
@@ -35,7 +35,7 @@ Maven:
 <dependency>
     <groupId>com.github.artbits</groupId>
     <artifactId>sqlite-java</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
 </dependency>
 ```
 

src/main/java/com/github/artbits/jsqlite/Core.java

@@ -64,7 +64,7 @@ public void close() {
     @Override
     public void tables(Class<?>... classes) {
         HashMap<String, HashMap<String, String>> tablesMap = new HashMap<>();
-        HashMap<String, Boolean> indexMap = new HashMap<>();
+        HashMap<String, String> indexMap = new HashMap<>();
         String s = SQLTemplate.query("sqlite_master", new Options().where("type = ?", "table"));
         try (Statement statement = connection.createStatement(); ResultSet result = statement.executeQuery(s)) {
             DatabaseMetaData metaData = connection.getMetaData();
@@ -83,9 +83,7 @@ public void tables(Class<?>... classes) {
                     while (set.next()) {
                         String index = set.getString("INDEX_NAME");
                         String column = set.getString("COLUMN_NAME");
-                        if (index != null) {
-                            indexMap.put(column, true);
-                        }
+                        Optional.ofNullable(index).ifPresent(i -> indexMap.put(index, column));
                     }
                 }
             }
@@ -106,25 +104,25 @@ public void tables(Class<?>... classes) {
                         }
                     });
                 }
-                reflect.getIndexList(column -> {
+                reflect.getIndexList((index, column) -> {
                     try {
-                        if (indexMap.getOrDefault(column, false)) {
-                            indexMap.remove(column, true);
+                        if (indexMap.get(index) != null) {
+                            indexMap.remove(index, column);
                         } else {
                             statement.executeUpdate(SQLTemplate.createIndex(tClass, column));
                         }
                     } catch (SQLException e) {
                         throw new RuntimeException(e);
                     }
                 });
-                indexMap.keySet().forEach(column -> {
-                    try {
-                        statement.executeUpdate(SQLTemplate.dropIndex(tClass, column));
-                    } catch (SQLException e) {
-                        throw new RuntimeException(e);
-                    }
-                });
             }
+            indexMap.forEach((index, column) -> {
+                try {
+                    statement.executeUpdate(SQLTemplate.dropIndex(index));
+                } catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }
+            });
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

src/main/java/com/github/artbits/jsqlite/Reflect.java

@@ -27,9 +27,11 @@
 final class Reflect<T> {
 
     private final Map<String, Field> fieldMap = new LinkedHashMap<>();
+    private Class<?> tClass;
     private T t;
 
     Reflect(Class<?> tClass) {
+        this.tClass = tClass;
         newInstance(tClass);
     }
 
@@ -140,10 +142,13 @@ void getDBColumnsWithType(BiConsumer<String, String> consumer) {
     }
 
 
-    void getIndexList(Consumer<String> consumer) {
+    void getIndexList(BiConsumer<String, String> consumer) {
+        String table = tClass.getSimpleName().toLowerCase();
         fieldMap.values().forEach(field -> {
             if (isIndex(field)) {
-                consumer.accept(field.getName());
+                String column = field.getName();
+                String index = String.format("idx_%s_%s", table, column);
+                consumer.accept(index, column);
             }
         });
     }

src/main/java/com/github/artbits/jsqlite/SQLTemplate.java

@@ -131,9 +131,7 @@ static <T> String createIndex(Class<T> tClass, String column) {
     }
 
 
-    static <T> String dropIndex(Class<T> tClass, String column) {
-        String table = tClass.getSimpleName().toLowerCase();
-        String index = $("idx_%s_%s", table, column);
+    static <T> String dropIndex(String index) {
         return $("drop index %s", index);
     }