Merge pull request #30 from arno82/toad-package-handling

Added combinePackage and removed unnecessary FileNameConstructor

Author: qwazer

src/main/java/com/googlecode/scheme2ddl/FileNameConstructor.java

@@ -35,6 +35,7 @@ public class FileNameConstructor implements InitializingBean {
     private String templateForSysDBA = "SCHEMA/types_plural/object_name.ext";
     private String preparedTemplate;
     private Map<String, String> extensionMap;
+	private boolean combinePackage;
 
 
     private boolean needToReplaceWindowsReservedFileNames = false;
@@ -90,6 +91,11 @@ public String map2FileName(UserObject userObject) {
         filename = filename.replace(nonOracleChar + kw_schema_UPPER, userObject.getSchema().toUpperCase());
 
         String typeName = abbreviate(userObject.getType()).replace(" ", "_");
+		
+		String typeName_backup = typeName;
+		if (combinePackage && typeName.equals("PACKAGE_BODY")) {
+			typeName = "PACKAGE";
+		}
 
         //process kw_types_plural before kw_type
         filename = filename.replace(nonOracleChar + kw_types_plural_lower, pluralaze(typeName).toLowerCase());
@@ -98,6 +104,9 @@ public String map2FileName(UserObject userObject) {
         filename = filename.replace(nonOracleChar + kw_type_lower, typeName.toLowerCase());
         filename = filename.replace(nonOracleChar + kw_type_UPPER, typeName.toUpperCase());
 
+		if (combinePackage) {
+			typeName = typeName_backup;
+		}
 
         String userObjectName = userObject.getName();
 
@@ -155,6 +164,10 @@ public void afterPropertiesSet() {
     public void setExtensionMap(Map<String, String> extensionMap) {
         this.extensionMap = extensionMap;
     }
+	
+	public void setCombinePackage(boolean combinePackage) {
+        this.combinePackage = combinePackage;
+    }
 
     public void setNeedToReplaceWindowsReservedFileNames(boolean needToReplaceWindowsReservedFileNames) {
         this.needToReplaceWindowsReservedFileNames = needToReplaceWindowsReservedFileNames;

src/main/java/com/googlecode/scheme2ddl/TypeNamesUtil.java

@@ -15,7 +15,6 @@ public class TypeNamesUtil {
      * @return type name for using in  DBMS_METADATA package
      */
     public static String map2TypeForDBMS(String type) {
-		FileNameConstructor fileNameConstructor;
         if (type.contains("DATABASE LINK"))
             return "DB_LINK";
         if (type.equals("JOB"))

src/main/resources/scheme2ddl.config.xml

@@ -79,6 +79,9 @@
         <!-- File extension map rules.
         Use predefined 'TOAD' or 'PL/SQL Developer' mapping or create custom mapping -->
         <property name="extensionMap" ref="sql_by_default"/>
+		<!-- combine package spec and body files into one packages directory.
+		Only use this for TOAD extensionMap, otherwise spec sql files overwrite body sql files.-->
+		<property name="combinePackage" value="false"/>
     </bean>
 
     <util:map id="sql_by_default">