Update QueryBuilder.

Author: gk-brown

.idea/dataSources.local.xml

@@ -14,7 +14,7 @@
 
 subprojects {
     group = 'org.httprpc'
-    version = '4.9.4'
+    version = '4.9.5'
 
     apply plugin: 'java-library'
 

build.gradle

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -269,6 +269,10 @@ 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) {
@@ -563,7 +567,9 @@ public static QueryBuilder insert(Class<?> type) {
 
         var sqlBuilder = new StringBuilder("insert into ");
 
-        sqlBuilder.append(getTableName(type));
+        var tableName = getTableName(type);
+
+        sqlBuilder.append(tableName);
 
         var columnNames = new LinkedList<String>();
         var parameters = new LinkedList<String>();
@@ -572,6 +578,10 @@ 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) {
@@ -651,7 +661,9 @@ public static QueryBuilder update(Class<?> type) {
 
         var sqlBuilder = new StringBuilder("update ");
 
-        sqlBuilder.append(getTableName(type));
+        var tableName = getTableName(type);
+
+        sqlBuilder.append(tableName);
         sqlBuilder.append(" set ");
 
         var i = 0;
@@ -662,6 +674,10 @@ 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) {

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

@@ -53,6 +53,12 @@ public interface A {
 
     @Table("B")
     public interface B extends A {
+        @Column("a")
+        @PrimaryKey
+        @ForeignKey(A.class)
+        @Override
+        String getA();
+
         @Column("e")
         Double getE();
 
@@ -167,6 +173,12 @@ public interface K {
         String getW();
     }
 
+    @Table("K")
+    public interface L extends K {
+        @Column("z")
+        String getZ();
+    }
+
     @Table("M")
     public static class M {
         private Integer m;
@@ -229,9 +241,11 @@ public void testSelectA() {
 
     @Test
     public void testSelectB() {
-        var queryBuilder = QueryBuilder.select(B.class).filterByPrimaryKey("a").limit(10);
+        var queryBuilder = QueryBuilder.select(A.class, B.class)
+            .join(B.class, A.class)
+            .filterByPrimaryKey("a").limit(10);
 
-        assertEquals("select B.a, B.b, B.c, B.e, B.d as x, B.f as y from B where B.a = ? limit 10", queryBuilder.toString());
+        assertEquals("select A.a, A.b, A.c, A.d as x, B.e, B.f as y from A join B on A.a = B.a where A.a = ? limit 10", queryBuilder.toString());
         assertEquals(listOf("a"), getParameters(queryBuilder));
     }
 
@@ -265,7 +279,7 @@ public void testSelectBtoD() {
             .filterByPrimaryKey("a")
             .filterByForeignKey(E.class, D.class, "d");
 
-        assertEquals("select B.a, B.b, B.c, B.e, B.d as x, B.f as y, E.z from B "
+        assertEquals("select B.a, B.e, B.f as y, E.z from B "
             + "join E on B.a = E.a "
             + "where B.a = ? "
             + "and E.d = ?", queryBuilder.toString());
@@ -337,6 +351,15 @@ public void testSelectIJK() {
         assertEquals(listOf("i"), getParameters(queryBuilder));
     }
 
+    @Test
+    public void testSelectL() {
+        var queryBuilder = QueryBuilder.select(L.class).filterByPrimaryKey("i");
+
+        assertEquals("select K.i, K.w, K.z from K where K.i = ?", queryBuilder.toString());
+
+        assertEquals(listOf("i"), getParameters(queryBuilder));
+    }
+
     @Test
     public void testSelectM() {
         var queryBuilder = QueryBuilder.select(M.class).filterByForeignKey(M.class, "m");