Update QueryBuilder.

Author: gk-brown

kilo-client/src/main/java/org/httprpc/kilo/sql/QueryBuilder.java

@@ -269,16 +269,16 @@ public static QueryBuilder select(Class<?>... types) {
             for (var entry : BeanAdapter.getProperties(type).entrySet()) {
                 var accessor = entry.getValue().getAccessor();
 
-                if (!getTableName(accessor.getDeclaringClass()).equals(tableName)) {
-                    continue;
-                }
-
                 var column = accessor.getAnnotation(Column.class);
 
                 if (column == null) {
                     continue;
                 }
 
+                if (!getTableName(accessor.getDeclaringClass()).equals(tableName)) {
+                    continue;
+                }
+
                 if (j > 0 && accessor.getAnnotation(ForeignKey.class) != null) {
                     continue;
                 }
@@ -385,13 +385,31 @@ public static QueryBuilder selectDistinctIndex(Class<?> type) {
     }
 
     private static String getTableName(Class<?> type) {
-        var table = type.getAnnotation(Table.class);
+        while (type != null) {
+            var table = type.getAnnotation(Table.class);
+
+            if (table != null) {
+                return table.value();
+            }
 
-        if (table == null) {
-            throw new UnsupportedOperationException("Table name is not defined.");
+            type = getSupertype(type);
         }
 
-        return table.value();
+        throw new UnsupportedOperationException("Table name is not defined.");
+    }
+
+    private static Class<?> getSupertype(Class<?> type) {
+        if (type.isInterface()) {
+            var interfaces = type.getInterfaces();
+
+            if (interfaces.length > 0) {
+                return interfaces[0];
+            } else {
+                return null;
+            }
+        } else {
+            return type.getSuperclass();
+        }
     }
 
     private static Function<Object, Object> getReadTransform(Method accessor) {
@@ -507,17 +525,7 @@ private static String getForeignKeyColumnName(Class<?> from, Class<?> to) {
                             return column.value();
                         }
 
-                        if (type.isInterface()) {
-                            var interfaces = type.getInterfaces();
-
-                            if (interfaces.length > 0) {
-                                type = interfaces[0];
-                            } else {
-                                type = null;
-                            }
-                        } else {
-                            type = type.getSuperclass();
-                        }
+                        type = getSupertype(type);
                     }
                 }
             }
@@ -578,16 +586,16 @@ public static QueryBuilder insert(Class<?> type) {
         for (var entry : BeanAdapter.getProperties(type).entrySet()) {
             var accessor = entry.getValue().getAccessor();
 
-            if (!getTableName(accessor.getDeclaringClass()).equals(tableName)) {
-                continue;
-            }
-
             var column = accessor.getAnnotation(Column.class);
 
             if (column == null) {
                 continue;
             }
 
+            if (!getTableName(accessor.getDeclaringClass()).equals(tableName)) {
+                continue;
+            }
+
             var primaryKey = accessor.getAnnotation(PrimaryKey.class);
 
             if (primaryKey != null && primaryKey.generated()) {
@@ -674,16 +682,16 @@ public static QueryBuilder update(Class<?> type) {
         for (var entry : BeanAdapter.getProperties(type).entrySet()) {
             var accessor = entry.getValue().getAccessor();
 
-            if (!getTableName(accessor.getDeclaringClass()).equals(tableName)) {
-                continue;
-            }
-
             var column = accessor.getAnnotation(Column.class);
 
             if (column == null) {
                 continue;
             }
 
+            if (!getTableName(accessor.getDeclaringClass()).equals(tableName)) {
+                continue;
+            }
+
             if (accessor.getAnnotation(PrimaryKey.class) != null || accessor.getAnnotation(Final.class) != null) {
                 continue;
             }

kilo-client/src/test/java/org/httprpc/kilo/sql/QueryBuilderTest.java

@@ -173,7 +173,6 @@ public interface K {
         String getW();
     }
 
-    @Table("K")
     public interface L extends K {
         @Column("z")
         String getZ();

kilo-test/src/main/java/org/httprpc/kilo/test/FilmDetail.java

@@ -16,11 +16,9 @@
 
 import org.httprpc.kilo.Description;
 import org.httprpc.kilo.sql.Column;
-import org.httprpc.kilo.sql.Table;
 
 import java.util.List;
 
-@Table("film")
 @Description("Represents detailed information about a film.")
 public interface FilmDetail extends Film {
     @Column("description")

kilo-test/src/main/java/org/httprpc/kilo/test/ItemDetail.java

@@ -17,11 +17,9 @@
 import org.httprpc.kilo.Description;
 import org.httprpc.kilo.sql.Column;
 import org.httprpc.kilo.sql.Final;
-import org.httprpc.kilo.sql.Table;
 
 import java.util.Date;
 
-@Table("item")
 @Description("Represents detailed information about an item in the catalog.")
 public interface ItemDetail extends Item {
     @Column("size")