Merge remote-tracking branch 'origin/master'

Author: JanHolger

src/main/java/org/javawebstack/orm/TableInfo.java

@@ -70,6 +70,7 @@ public TableInfo(Class<? extends Model> model, ORMConfig config) throws ORMConfi
                 SQLType sqlType = mapper.getType(field.getType(), fieldConfig.size());
                 if(sqlType != null) {
                     sqlTypes.put(fieldName, sqlType);
+
                     sqlTypeParameters.put(fieldName, mapper.getTypeParameters(field.getType(), fieldConfig.size()));
                     break;
                 }

src/main/java/org/javawebstack/orm/mapper/DefaultMapper.java

@@ -80,7 +80,7 @@ public SQLType getType(Class<?> type, int size){
 
     public String getTypeParameters(Class<?> type, int size){
         if(type.isEnum())
-            return Arrays.stream(((Class<? extends Enum<?>>) type).getEnumConstants()).map(c -> c.name()).collect(Collectors.joining(","));
+            return Arrays.stream(((Class<? extends Enum<?>>) type).getEnumConstants()).map(c -> "'"+c.name()+"'").collect(Collectors.joining(","));
         if(type.equals(String.class))
             return size > 255 || size < 1 ? null : String.valueOf(size);
         return null;

src/main/java/org/javawebstack/orm/migration/AutoMigrator.java

@@ -39,6 +39,7 @@ private static void migrateTable(SQL sql, TableInfo info, boolean tableExists){
                 .append("` ");
             sb.append(info.getType(fieldName).name());
             String parameterTypes = info.getTypeParameters(fieldName);
+
             if(parameterTypes != null)
                 sb.append('(')
                 .append(parameterTypes)

src/main/java/org/javawebstack/orm/wrapper/MySQL.java

@@ -45,9 +45,9 @@ public Connection getConnection(){
                     Class.forName("com.mysql.jdbc.Driver");
                     c = DriverManager.getConnection("jdbc:mysql://" + this.host + ":" + this.port + "/" + this.database + "?user=" + this.username + "&password=" + this.password + "&autoReconnect=" + true + "&failOverReadOnly=false&maxReconnects=" + 5 + "&UseUnicode=yes&characterEncoding=UTF-8");
                 } catch (SQLException e) {
-                    System.out.println("Fehler: bei getConnection()[MySQL.java]  SQLException   " + e.getMessage());
+                    System.out.println("Error: at getConnection()[MySQL.java]  SQLException   " + e.getMessage());
                 } catch (ClassNotFoundException e) {
-                    System.out.println("Fehler: bei getConnection()[MySQL.java]  ClassNotFoundException");
+                    System.out.println("Error: at getConnection()[MySQL.java]  ClassNotFoundException");
                 }
             }
         } catch (SQLException e) {e.printStackTrace();}

src/main/java/org/javawebstack/orm/wrapper/SQLite.java

@@ -20,7 +20,7 @@ public Connection getConnection(){
                 try {
                     c = DriverManager.getConnection("jdbc:sqlite:"+file);
                 } catch (SQLException e) {
-                    System.out.println("Fehler: bei getConnection()[SQLite.java]  SQLException   " + e.getMessage());
+                    System.out.println("Error: at getConnection()[SQLite.java]  SQLException   " + e.getMessage());
                 }
             }
         } catch (SQLException e) {e.printStackTrace();}