Add basic support for UDTs, Enums and Domains

src/main/java/ru/fusionsoft/dbgit/adapters/DBAdapter.java

@@ -169,6 +169,9 @@ private void printRestoreMessage(IMetaObject obj) {
 		if(obj instanceof MetaView){ leafName = "restoreView"; }
 		if(obj instanceof MetaTrigger){ leafName = "restoreTrigger"; }
 		if(obj instanceof MetaSchema){ leafName = "restoreSchema"; }
+		if(obj instanceof MetaUDT){ leafName = "restoreUDT"; }
+		if(obj instanceof MetaEnum){ leafName = "restoreEnum"; }
+		if(obj instanceof MetaDomain){ leafName = "restoreDomain"; }
 		if(obj instanceof MetaRole){ leafName = "restoreRole"; }
 		if(obj instanceof MetaProcedure){ leafName = "restorePrc"; }
 		if(obj instanceof MetaPackage){ leafName = "restorePkg"; }

src/main/java/ru/fusionsoft/dbgit/adapters/DBAdapterProxy.java

@@ -8,6 +8,8 @@
 import ru.fusionsoft.dbgit.core.SchemaSynonym;
 import ru.fusionsoft.dbgit.core.db.DbType;
 import ru.fusionsoft.dbgit.dbobjects.DBConstraint;
+import ru.fusionsoft.dbgit.dbobjects.DBDomain;
+import ru.fusionsoft.dbgit.dbobjects.DBEnum;
 import ru.fusionsoft.dbgit.dbobjects.DBFunction;
 import ru.fusionsoft.dbgit.dbobjects.DBIndex;
 import ru.fusionsoft.dbgit.dbobjects.DBPackage;
@@ -22,6 +24,7 @@
 import ru.fusionsoft.dbgit.dbobjects.DBTableSpace;
 import ru.fusionsoft.dbgit.dbobjects.DBTrigger;
 import ru.fusionsoft.dbgit.dbobjects.DBUser;
+import ru.fusionsoft.dbgit.dbobjects.DBUserDefinedType;
 import ru.fusionsoft.dbgit.dbobjects.DBView;
 import ru.fusionsoft.dbgit.meta.IMapMetaObject;
 
@@ -186,7 +189,37 @@ public Map<String, DBUser> getUsers() {
 	public Map<String, DBRole> getRoles() {
 		return adapter.getRoles();
 	}
-
+
+	@Override
+	public Map<String, DBUserDefinedType> getUDTs(String schema) {
+		return adapter.getUDTs(schema);
+	}
+
+	@Override
+	public Map<String, DBDomain> getDomains(String schema) {
+		return adapter.getDomains(schema);
+	}
+
+	@Override
+	public Map<String, DBEnum> getEnums(String schema) {
+		return adapter.getEnums(schema);
+	}
+
+	@Override
+	public DBUserDefinedType getUDT(String schema, String name) {
+		return adapter.getUDT(schema, name);
+	}
+
+	@Override
+	public DBDomain getDomain(String schema, String name) {
+		return adapter.getDomain(schema, name);
+	}
+
+	@Override
+	public DBEnum getEnum(String schema, String name) {
+		return adapter.getEnum(schema, name);
+	}
+
 	public <T extends DBSchemaObject> T schemaSynonymMap(T object) {
 		if (object == null) 
 			return null;

src/main/java/ru/fusionsoft/dbgit/adapters/IDBAdapter.java

@@ -7,6 +7,8 @@
 import ru.fusionsoft.dbgit.core.ExceptionDBGit;
 import ru.fusionsoft.dbgit.core.db.DbType;
 import ru.fusionsoft.dbgit.dbobjects.DBConstraint;
+import ru.fusionsoft.dbgit.dbobjects.DBDomain;
+import ru.fusionsoft.dbgit.dbobjects.DBEnum;
 import ru.fusionsoft.dbgit.dbobjects.DBFunction;
 import ru.fusionsoft.dbgit.dbobjects.DBIndex;
 import ru.fusionsoft.dbgit.dbobjects.DBPackage;
@@ -21,6 +23,7 @@
 import ru.fusionsoft.dbgit.dbobjects.DBTableSpace;
 import ru.fusionsoft.dbgit.dbobjects.DBTrigger;
 import ru.fusionsoft.dbgit.dbobjects.DBUser;
+import ru.fusionsoft.dbgit.dbobjects.DBUserDefinedType;
 import ru.fusionsoft.dbgit.dbobjects.DBView;
 import ru.fusionsoft.dbgit.meta.IMapMetaObject;
 
@@ -143,7 +146,13 @@ public interface IDBAdapter {
 
 	public Map<String, DBUser> getUsers();
 	public Map<String, DBRole> getRoles();
-
+	Map<String, DBUserDefinedType> getUDTs(String schema);
+	Map<String, DBDomain> getDomains(String schema);
+	Map<String, DBEnum> getEnums(String schema);
+	DBUserDefinedType getUDT(String schema, String name);
+	DBDomain getDomain(String schema, String name);
+	DBEnum getEnum(String schema, String name);
+
 	public boolean userHasRightsToGetDdlOfOtherUsers();
 
 	public IFactoryDBBackupAdapter getBackupAdapterFactory();

src/main/java/ru/fusionsoft/dbgit/core/GitMetaDataManager.java

@@ -94,7 +94,7 @@ private void addToMapSqlObject(
 
 			objs.put(obj);
 		 }
-	}
+	}	
 
 	public boolean loadFromDB(IMetaObject obj) throws ExceptionDBGit {		
 		try {
@@ -241,6 +241,12 @@ public IMapMetaObject loadDBMetaData(boolean includeBackupSchemas) throws Except
 				addToMapSqlObject(dbObjs, adapter.getProcedures(schema.getName()), DBGitMetaType.DbGitProcedure);
 			if (!ignore.matchOne(schema.getName() + "/*." + DBGitMetaType.DbGitView.getValue()))
 				addToMapSqlObject(dbObjs, adapter.getViews(schema.getName()), DBGitMetaType.DbGitView);
+			if (!ignore.matchOne(schema.getName() + "/*." + DBGitMetaType.DBGitEnum.getValue()))
+				addToMapSqlObject(dbObjs, adapter.getEnums(schema.getName()), DBGitMetaType.DBGitEnum);
+			if (!ignore.matchOne(schema.getName() + "/*." + DBGitMetaType.DBGitUserDefinedType.getValue()))
+				addToMapSqlObject(dbObjs, adapter.getUDTs(schema.getName()), DBGitMetaType.DBGitUserDefinedType);
+			if (!ignore.matchOne(schema.getName() + "/*." + DBGitMetaType.DBGitDomain.getValue()))
+				addToMapSqlObject(dbObjs, adapter.getDomains(schema.getName()), DBGitMetaType.DBGitDomain);
 		}
 
 		//data tables

src/main/java/ru/fusionsoft/dbgit/dbobjects/DBDomain.java

@@ -0,0 +1,13 @@
+package ru.fusionsoft.dbgit.dbobjects;
+
+import java.util.Set;
+import ru.fusionsoft.dbgit.utils.StringProperties;
+
+public class DBDomain extends DBSQLObject {
+    public DBDomain() {
+    }
+
+    public DBDomain(String name, StringProperties options, String schema, String owner, Set<String> dependencies, String sql) {
+        super(name, options, schema, owner, dependencies, sql);
+    }
+}

src/main/java/ru/fusionsoft/dbgit/dbobjects/DBEnum.java

@@ -0,0 +1,13 @@
+package ru.fusionsoft.dbgit.dbobjects;
+
+import java.util.Set;
+import ru.fusionsoft.dbgit.utils.StringProperties;
+
+public class DBEnum extends DBSQLObject {
+    public DBEnum() {
+    }
+
+    public DBEnum(String name, StringProperties options, String schema, String owner, Set<String> dependencies, String sql) {
+        super(name, options, schema, owner, dependencies, sql);
+    }
+}

src/main/java/ru/fusionsoft/dbgit/dbobjects/DBUserDefinedType.java

@@ -0,0 +1,13 @@
+package ru.fusionsoft.dbgit.dbobjects;
+
+import java.util.Set;
+import ru.fusionsoft.dbgit.utils.StringProperties;
+
+public class DBUserDefinedType extends DBSQLObject {
+    public DBUserDefinedType() {
+    }
+
+    public DBUserDefinedType(String name, StringProperties options, String schema, String owner, Set<String> dependencies, String sql) {
+        super(name, options, schema, owner, dependencies, sql);
+    }
+}

src/main/java/ru/fusionsoft/dbgit/meta/DBGitMetaType.java

@@ -46,6 +46,36 @@ public Integer getPriority() {
 		}
 	},
 
+	DBGitUserDefinedType("udt"){		
+		public Class<?> getMetaClass() {
+			return MetaUDT.class;
+		}
+
+		public Integer getPriority() {
+			return 11;
+		}
+	},		
+
+	DBGitEnum("enum"){		
+		public Class<?> getMetaClass() {
+			return MetaEnum.class;
+		}
+
+		public Integer getPriority() {
+			return 12;
+		}
+	},	
+
+	DBGitDomain("domain"){		
+		public Class<?> getMetaClass() {
+			return MetaDomain.class;
+		}
+
+		public Integer getPriority() {
+			return 13;
+		}
+	},	
+
 	DBGitSequence("seq"){		
 		public Class<?> getMetaClass() {
 			return MetaSequence.class;
@@ -134,8 +164,7 @@ public Class<?> getMetaClass() {
 		public Integer getPriority() {
 			return 210;
 		}
-	}
-	;
+	};
 
 	private static Map<String, IDBGitMetaType> listAllTypes;
 	static {

src/main/java/ru/fusionsoft/dbgit/meta/MetaDomain.java

@@ -0,0 +1,40 @@
+package ru.fusionsoft.dbgit.meta;
+
+import ru.fusionsoft.dbgit.adapters.AdapterFactory;
+import ru.fusionsoft.dbgit.adapters.IDBAdapter;
+import ru.fusionsoft.dbgit.core.ExceptionDBGit;
+import ru.fusionsoft.dbgit.dbobjects.DBDomain;
+import ru.fusionsoft.dbgit.dbobjects.DBSQLObject;
+
+public class MetaDomain extends MetaSql {
+    public MetaDomain() {
+    }
+
+    public MetaDomain(DBSQLObject sqlObject) throws ExceptionDBGit {
+        super(sqlObject);
+    }
+
+    /**
+     * @return Type meta object
+     */
+    @Override
+    public final IDBGitMetaType getType() {
+        return DBGitMetaType.DBGitDomain;
+    }
+
+    /**
+     * load current object from DB
+     */
+    @Override
+    public final boolean loadFromDB() throws ExceptionDBGit {
+        final IDBAdapter adapter = AdapterFactory.createAdapter();
+        final NameMeta nm = MetaObjectFactory.parseMetaName(name);
+        final DBDomain dbObject = adapter.getDomain(nm.getSchema(), nm.getName());
+
+        if (dbObject != null) {
+            setSqlObject(dbObject);
+            return true;
+        } else
+            return false;
+    }
+}

src/main/java/ru/fusionsoft/dbgit/meta/MetaEnum.java

@@ -0,0 +1,32 @@
+package ru.fusionsoft.dbgit.meta;
+
+import ru.fusionsoft.dbgit.adapters.AdapterFactory;
+import ru.fusionsoft.dbgit.adapters.IDBAdapter;
+import ru.fusionsoft.dbgit.core.ExceptionDBGit;
+import ru.fusionsoft.dbgit.dbobjects.DBEnum;
+
+public class MetaEnum extends MetaSql {
+    /**
+     * @return Type meta object
+     */
+    @Override
+    public IDBGitMetaType getType() {
+        return DBGitMetaType.DBGitEnum;
+    }
+
+    /**
+     * load current object from DB
+     */
+    @Override
+    public boolean loadFromDB() throws ExceptionDBGit {
+        final IDBAdapter adapter = AdapterFactory.createAdapter();
+        final NameMeta nm = MetaObjectFactory.parseMetaName(name);
+        final DBEnum dbObject = adapter.getEnum(nm.getSchema(), nm.getName());
+
+        if (dbObject != null) {
+            setSqlObject(dbObject);
+            return true;
+        } else
+            return false;
+    }
+}

src/main/java/ru/fusionsoft/dbgit/meta/MetaUDT.java

@@ -0,0 +1,40 @@
+package ru.fusionsoft.dbgit.meta;
+
+import ru.fusionsoft.dbgit.adapters.AdapterFactory;
+import ru.fusionsoft.dbgit.adapters.IDBAdapter;
+import ru.fusionsoft.dbgit.core.ExceptionDBGit;
+import ru.fusionsoft.dbgit.dbobjects.DBSQLObject;
+import ru.fusionsoft.dbgit.dbobjects.DBUserDefinedType;
+
+public class MetaUDT extends MetaSql {
+    public MetaUDT() {
+    }
+
+    public MetaUDT(DBSQLObject sqlObject) throws ExceptionDBGit {
+        super(sqlObject);
+    }
+
+    /**
+     * @return Type meta object
+     */
+    @Override
+    public final IDBGitMetaType getType() {
+        return DBGitMetaType.DBGitUserDefinedType;
+    }
+
+    /**
+     * load current object from DB
+     */
+    @Override
+    public final boolean loadFromDB() throws ExceptionDBGit {
+        final IDBAdapter adapter = AdapterFactory.createAdapter();
+        final NameMeta nm = MetaObjectFactory.parseMetaName(name);
+        final DBUserDefinedType dbObject = adapter.getUDT(nm.getSchema(), nm.getName());
+
+        if (dbObject != null) {
+            setSqlObject(dbObject);
+            return true;
+        } else
+            return false;
+    }
+}

src/main/java/ru/fusionsoft/dbgit/mssql/DBAdapterMssql.java

@@ -1163,6 +1163,39 @@ public Map<String, DBRole> getRoles() {
 		return listRole;
 	}
 
+	@Override
+	public Map<String, DBUserDefinedType> getUDTs(String schema) {
+		return Collections.emptyMap();
+	}
+
+	@Override
+	public Map<String, DBDomain> getDomains(String schema) {
+		return Collections.emptyMap();
+	}
+
+	@Override
+	public Map<String, DBEnum> getEnums(String schema) {
+		return Collections.emptyMap();
+	}
+
+	@Override
+	public DBUserDefinedType getUDT(String schema, String name) {
+		final String msg = lang.getValue("errors", "adapter", "objectNotFoundInDb").toString();
+		throw new ExceptionDBGitObjectNotFound(msg);
+	}
+
+	@Override
+	public DBDomain getDomain(String schema, String name) {
+		final String msg = lang.getValue("errors", "adapter", "objectNotFoundInDb").toString();
+		throw new ExceptionDBGitObjectNotFound(msg);
+	}
+
+	@Override
+	public DBEnum getEnum(String schema, String name) {
+		final String msg = lang.getValue("errors", "adapter", "objectNotFoundInDb").toString();
+		throw new ExceptionDBGitObjectNotFound(msg);
+	}
+
 	@Override
 	public boolean userHasRightsToGetDdlOfOtherUsers() {
 	    try{