Merge pull request #42 from vsalaman/db_remove_stdout

Removes default output to STDOUT on createSchema.
jpos · Aug 25, 2016 · 070dbab · 070dbab
2 parents 0eadb4a + 35b9adb
commit 070dbab
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/modules/dbsupport/src/main/java/org/jpos/ee/DB.java b/modules/dbsupport/src/main/java/org/jpos/ee/DB.java
@@ -247,15 +247,19 @@ public void createSchema(String outputFile, boolean create) throws HibernateExce
         try {
             // SchemaExport export = new SchemaExport(getMetadata());
             SchemaExport export = new SchemaExport();
-            EnumSet<TargetType> targetTypes = EnumSet.of(TargetType.STDOUT);
+            List<TargetType> targetTypes=new ArrayList<>();
             if (outputFile != null) {
-                export.setOutputFile(outputFile);
-                export.setDelimiter(";");
-                targetTypes.add(TargetType.SCRIPT);
+                if(outputFile.trim().equals("-")) targetTypes.add(TargetType.STDOUT);
+                else {
+                    export.setOutputFile(outputFile);
+                    export.setDelimiter(";");
+                    targetTypes.add(TargetType.SCRIPT);
+                }
             }
             if (create)
                 targetTypes.add(TargetType.DATABASE);
-            export.create(targetTypes, getMetadata());
+            if(targetTypes.size()>0)
+                export.create(EnumSet.copyOf(targetTypes), getMetadata());
         }
         catch (IOException | ConfigurationException e)
         {