Merge pull request #48 from ZorTik/development

Development

Author: ZorTik

asql-core/src/main/java/me/zort/sqllib/model/builder/EntitySchemaBuilder.java

@@ -16,6 +16,8 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -51,7 +53,10 @@ public TableSchema buildTableSchema() {
 
     debug("Building defs from type class: " + typeClass.getName());
 
+    boolean multiplePK = getPKCount() > 1;
+
     ColumnDefinition[] defs = new ColumnDefinition[0];
+    List<String> pks = new ArrayList<>();
     for (Field field : typeClass.getDeclaredFields()) {
       debug("Building def for field: " + field.getName() + " (" + field.getType().getName() + ")");
       if (Modifier.isTransient(field.getModifiers())) {
@@ -60,7 +65,7 @@ public TableSchema buildTableSchema() {
       }
 
       String colName = namingStrategy.fieldNameToColumn(field.getName());
-      String colType = recognizeFieldTypeToDbType(field);
+      String colType = recognizeFieldTypeToDbType(field, multiplePK);
 
       if (colType != null && !colType.contains("NOT NULL") && field.isAnnotationPresent(NullableField.class)) {
         if (!field.getAnnotation(NullableField.class).nullable()) {
@@ -75,17 +80,35 @@ public TableSchema buildTableSchema() {
         colType += " DEFAULT " + defaultValue;
       }
 
+      if (field.isAnnotationPresent(PrimaryKey.class)) {
+        pks.add(colName);
+      }
+
       defs = Arrays.add(defs, new ColumnDefinition(colName, colType));
 
       debug("Added def: " + colName + " " + colType);
     }
 
+    if (multiplePK) {
+        defs = Arrays.add(defs, new ColumnDefinition("PRIMARY KEY", String.format("(%s)", String.join(", ", pks))));
+    }
+
     debug("Built defs: " + java.util.Arrays.toString(defs));
 
     return new TableSchema(tableName, defs);
   }
 
-  private String recognizeFieldTypeToDbType(Field field) {
+  private int getPKCount() {
+    int count = 0;
+    for (Field field : typeClass.getDeclaredFields()) {
+      if (field.isAnnotationPresent(PrimaryKey.class)) {
+        count++;
+      }
+    }
+    return count;
+  }
+
+  private String recognizeFieldTypeToDbType(Field field, boolean multiplePK) {
     Class<?> fieldType = Primitives.wrap(field.getType());
     boolean isSupported = isSupported(fieldType);
 
@@ -111,8 +134,9 @@ private String recognizeFieldTypeToDbType(Field field) {
       dbType = "FLOAT";
     }
 
-    if (field.isAnnotationPresent(PrimaryKey.class))
+    if (field.isAnnotationPresent(PrimaryKey.class) && !multiplePK) {
       dbType += " PRIMARY KEY";
+    }
 
     if (Validator.validateAutoIncrement(field))
       dbType += " " + (isSQLite() ? "AUTOINCREMENT" : "AUTO_INCREMENT");

src/test/java/me/zort/sqllib/test/TestCase1.java

@@ -223,7 +223,12 @@ public void test8_RawQuery() {
   }
 
   @Test
-  public void test9_Close() {
+  public void test9_MultiplePk() {
+    assertTrue(connection.buildEntitySchema("multiple_pk", MultiplePKModel.class));
+  }
+
+  @AfterAll
+  public void close() {
     System.out.println("Closing connection...");
     connection.disconnect();
     System.out.println("Connection closed");
@@ -264,4 +269,13 @@ public int hashCode() {
     }
   }
 
+  @AllArgsConstructor
+  private static class MultiplePKModel {
+    @PrimaryKey
+    private final String nickname;
+    @PrimaryKey
+    private final String email;
+    private final int points;
+  }
+
 }