Added parent class support for models.

x7airworker · x7airworker · commit b2290a5f648c · 2021-11-29T15:54:56.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-        <buildVersion>1.0.2-SNAPSHOT</buildVersion>
+        <buildVersion>1.0.3-SNAPSHOT</buildVersion>
     </properties>
 
     <groupId>org.javawebstack</groupId>
diff --git a/src/main/java/org/javawebstack/orm/TableInfo.java b/src/main/java/org/javawebstack/orm/TableInfo.java
@@ -29,7 +29,7 @@ public class TableInfo {
     private final Class<? extends Model> modelClass;
     private String primaryKey;
     private final List<String> uniqueKeys = new ArrayList<>();
-    private final Constructor<?> constructor;
+    private Constructor<?> constructor;
     private String relationField;
     private final Map<String, String> filterable = new HashMap<>();
     private final List<String> searchable = new ArrayList<>();
@@ -42,6 +42,18 @@ public class TableInfo {
     public TableInfo(Class<? extends Model> model, ORMConfig config) throws ORMConfigurationException {
         this.config = config;
         this.modelClass = model;
+        if (model.getSuperclass() != Model.class) {
+            Class<? extends Model> superModel = (Class<? extends Model>) model.getSuperclass();
+            if (Modifier.isAbstract(superModel.getModifiers())) {
+                constructInfo(superModel);
+            } else {
+                throw new ORMConfigurationException("The parent model has to be abstract!");
+            }
+        }
+        constructInfo(model);
+    }
+
+    private void constructInfo (Class<? extends Model> model) throws ORMConfigurationException {
         if (model.isAnnotationPresent(Table.class)) {
             Table table = model.getDeclaredAnnotationsByType(Table.class)[0];
             tableName = table.value();
@@ -82,7 +94,7 @@ public TableInfo(Class<? extends Model> model, ORMConfig config) throws ORMConfi
             else
                 fieldSize = fieldConfig.size();
 
-                SQLType sqlType = config.getType(field.getType(), fieldSize);
+            SQLType sqlType = config.getType(field.getType(), fieldSize);
             if (sqlType != null) {
                 sqlTypes.put(fieldName, sqlType);
                 sqlTypeParameters.put(fieldName, config.getTypeParameters(field.getType(), fieldSize));
diff --git a/src/test/java/org/javawebstack/orm/test/TableInfoTest.java b/src/test/java/org/javawebstack/orm/test/TableInfoTest.java
@@ -0,0 +1,51 @@
+package org.javawebstack.orm.test;
+
+import org.javawebstack.orm.Model;
+import org.javawebstack.orm.ORM;
+import org.javawebstack.orm.ORMConfig;
+import org.javawebstack.orm.Repo;
+import org.javawebstack.orm.annotation.Column;
+import org.javawebstack.orm.exception.ORMConfigurationException;
+import org.javawebstack.orm.util.KeyType;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TableInfoTest extends ORMTestCase {
+    @Test
+    public void testParentTableInfo () throws ORMConfigurationException {
+        ORMConfig config = new ORMConfig()
+                .setDefaultSize(255);
+        ORM.register(Child.class, sql(), config);
+
+        assertEquals(Repo.get(Child.class).getInfo().getFields().size(), 2);
+    }
+
+    @Test
+    public void testParentTableMigration () throws ORMConfigurationException {
+        ORMConfig config = new ORMConfig()
+                .setDefaultSize(255);
+        ORM.register(Child.class, sql(), config);
+        ORM.autoMigrate(true);
+
+        Child child = new Child();
+        child.id = 1337;
+        child.content = "Hello World!";
+        child.save();
+
+        Child fetchedChild = Repo.get(Child.class).get(1337);
+        assertEquals(fetchedChild.id, child.id);
+        assertEquals(fetchedChild.content, child.content);
+    }
+
+
+    public static abstract class Parent extends Model {
+        @Column(ai = true, key = KeyType.PRIMARY)
+        public int id;
+    }
+
+    public static class Child extends Parent {
+        @Column
+        public String content;
+    }
+}
