Merge branch 'master' into 0.6-yb

greenlaw110 · greenlaw110 · commit 92997224dd21 · 2017-03-01T08:32:03.000+11:00
diff --git a/src/main/java/act/db/ebean/EbeanService.java b/src/main/java/act/db/ebean/EbeanService.java
@@ -159,14 +159,14 @@ private ServerConfig serverConfig(String id, Map<String, Object> conf) {
         if (null != ddlRun) {
             sc.setDdlRun(Boolean.parseBoolean(ddlRun));
         } else if (Act.isDev()) {
-            sc.setDdlRun(noddl);
+            sc.setDdlRun(!noddl);
         }
 
         String ddlCreateOnly = (String) conf.get("ddl.createOnly");
         if (null != ddlCreateOnly) {
             sc.setDdlCreateOnly(Boolean.parseBoolean(ddlCreateOnly));
-        } else {
-            sc.setDdlCreateOnly(true);
+        } else if (Act.isDev()) {
+            sc.setDdlCreateOnly(!noddl);
         }
 
         for (Class<?> c : modelTypes) {
