regenerated code for DBDefinition model using Eclipse 3.2
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/CheckOption.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/CheckOption.java
index 7412aec..1f59d5e 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/CheckOption.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/CheckOption.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CheckOption.java,v 1.1 2005/08/02 22:56:24 ledunnel Exp $
+ * $Id: CheckOption.java,v 1.2 2005/12/22 23:32:55 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition;
 
@@ -67,7 +67,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final CheckOption NONE_LITERAL = new CheckOption(NONE, "NONE"); //$NON-NLS-1$
+	public static final CheckOption NONE_LITERAL = new CheckOption(NONE, "NONE", "NONE"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>CASCADE</b></em>' literal object.
@@ -81,7 +81,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final CheckOption CASCADE_LITERAL = new CheckOption(CASCADE, "CASCADE"); //$NON-NLS-1$
+	public static final CheckOption CASCADE_LITERAL = new CheckOption(CASCADE, "CASCADE", "CASCADE"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>LOCAL</b></em>' literal object.
@@ -95,7 +95,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final CheckOption LOCAL_LITERAL = new CheckOption(LOCAL, "LOCAL"); //$NON-NLS-1$
+	public static final CheckOption LOCAL_LITERAL = new CheckOption(LOCAL, "LOCAL", "LOCAL"); //$NON-NLS-1$
 
 	/**
 	 * An array of all the '<em><b>Check Option</b></em>' enumerators.
@@ -119,15 +119,15 @@
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Check Option</b></em>' literal with the specified name.
+	 * Returns the '<em><b>Check Option</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static CheckOption get(String name) {
+	public static CheckOption get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			CheckOption result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -135,7 +135,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Check Option</b></em>' literal with the specified value.
+	 * Returns the '<em><b>Check Option</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static CheckOption getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			CheckOption result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Check Option</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -155,8 +171,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private CheckOption(int value, String name) {
-		super(value, name);
+	private CheckOption(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //CheckOption
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/DatabaseDefinitionFactory.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/DatabaseDefinitionFactory.java
index b8e56a5..feb0671 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/DatabaseDefinitionFactory.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/DatabaseDefinitionFactory.java
@@ -20,14 +20,14 @@
  * @see org.eclipse.datatools.modelbase.dbdefinition.DatabaseDefinitionPackage
  * @generated
  */
-public interface DatabaseDefinitionFactory extends EFactory{
+public interface DatabaseDefinitionFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	DatabaseDefinitionFactory eINSTANCE = new org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionFactoryImpl();
+	DatabaseDefinitionFactory eINSTANCE = org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Database Vendor Definition</em>'.
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/DatabaseDefinitionPackage.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/DatabaseDefinitionPackage.java
index 857477b..1687e3a 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/DatabaseDefinitionPackage.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/DatabaseDefinitionPackage.java
@@ -31,7 +31,7 @@
  * @model kind="package"
  * @generated
  */
-public interface DatabaseDefinitionPackage extends EPackage{
+public interface DatabaseDefinitionPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
@@ -462,7 +462,7 @@
 	int DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_SUPPORTED = 42;
 
 	/**
-	 * The number of structural features of the the '<em>Database Vendor Definition</em>' class.
+	 * The number of structural features of the '<em>Database Vendor Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -859,7 +859,7 @@
 	int PREDEFINED_DATA_TYPE_DEFINITION__FIELD_QUALIFIER_SEPARATOR = 41;
 
 	/**
-	 * The number of structural features of the the '<em>Predefined Data Type Definition</em>' class.
+	 * The number of structural features of the '<em>Predefined Data Type Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -986,7 +986,7 @@
 	int TABLE_SPACE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = 11;
 
 	/**
-	 * The number of structural features of the the '<em>Table Space Definition</em>' class.
+	 * The number of structural features of the '<em>Table Space Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1140,7 +1140,7 @@
 	int STORED_PROCEDURE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = 14;
 
 	/**
-	 * The number of structural features of the the '<em>Stored Procedure Definition</em>' class.
+	 * The number of structural features of the '<em>Stored Procedure Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1258,7 +1258,7 @@
 	int TRIGGER_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = 10;
 
 	/**
-	 * The number of structural features of the the '<em>Trigger Definition</em>' class.
+	 * The number of structural features of the '<em>Trigger Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1358,7 +1358,7 @@
 	int COLUMN_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = 8;
 
 	/**
-	 * The number of structural features of the the '<em>Column Definition</em>' class.
+	 * The number of structural features of the '<em>Column Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1494,7 +1494,7 @@
 	int CONSTRAINT_DEFINITION__MAXIMUM_CHECK_CONSTRAINT_IDENTIFIER_LENGTH = 12;
 
 	/**
-	 * The number of structural features of the the '<em>Constraint Definition</em>' class.
+	 * The number of structural features of the '<em>Constraint Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1576,7 +1576,7 @@
 	int INDEX_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = 6;
 
 	/**
-	 * The number of structural features of the the '<em>Index Definition</em>' class.
+	 * The number of structural features of the '<em>Index Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1613,7 +1613,7 @@
 	int EXTENDED_DEFINITION__VALUE = 1;
 
 	/**
-	 * The number of structural features of the the '<em>Extended Definition</em>' class.
+	 * The number of structural features of the '<em>Extended Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1686,7 +1686,7 @@
 	int TABLE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = 5;
 
 	/**
-	 * The number of structural features of the the '<em>Table Definition</em>' class.
+	 * The number of structural features of the '<em>Table Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1786,7 +1786,7 @@
 	int SEQUENCE_DEFINITION__CACHE_DEFAULT_VALUE = 8;
 
 	/**
-	 * The number of structural features of the the '<em>Sequence Definition</em>' class.
+	 * The number of structural features of the '<em>Sequence Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1841,7 +1841,7 @@
 	int USER_DEFINED_TYPE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = 3;
 
 	/**
-	 * The number of structural features of the the '<em>User Defined Type Definition</em>' class.
+	 * The number of structural features of the '<em>User Defined Type Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1923,7 +1923,7 @@
 	int QUERY_DEFINITION__TABLE_ALIAS_IN_DELETE_SUPPORTED = 6;
 
 	/**
-	 * The number of structural features of the the '<em>Query Definition</em>' class.
+	 * The number of structural features of the '<em>Query Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1969,7 +1969,7 @@
 	int SQL_SYNTAX_DEFINITION__TERMINATION_CHARACTER = 2;
 
 	/**
-	 * The number of structural features of the the '<em>SQL Syntax Definition</em>' class.
+	 * The number of structural features of the '<em>SQL Syntax Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2015,7 +2015,7 @@
 	int NICKNAME_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = 2;
 
 	/**
-	 * The number of structural features of the the '<em>Nickname Definition</em>' class.
+	 * The number of structural features of the '<em>Nickname Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2043,7 +2043,7 @@
 	int SCHEMA_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = 0;
 
 	/**
-	 * The number of structural features of the the '<em>Schema Definition</em>' class.
+	 * The number of structural features of the '<em>Schema Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2071,7 +2071,7 @@
 	int VIEW_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = 0;
 
 	/**
-	 * The number of structural features of the the '<em>View Definition</em>' class.
+	 * The number of structural features of the '<em>View Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2162,7 +2162,7 @@
 	int FIELD_QUALIFIER_DEFINITION__SCALE_SUPPORTED = 7;
 
 	/**
-	 * The number of structural features of the the '<em>Field Qualifier Definition</em>' class.
+	 * The number of structural features of the '<em>Field Qualifier Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -2190,7 +2190,7 @@
 	int DEBUGGER_DEFINITION__CONDITION_SUPPORTED = 0;
 
 	/**
-	 * The number of structural features of the the '<em>Debugger Definition</em>' class.
+	 * The number of structural features of the '<em>Debugger Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -4746,4 +4746,1875 @@
 	 */
 	DatabaseDefinitionFactory getDatabaseDefinitionFactory();
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals  {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseVendorDefinitionImpl <em>Database Vendor Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseVendorDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getDatabaseVendorDefinition()
+		 * @generated
+		 */
+		EClass DATABASE_VENDOR_DEFINITION = eINSTANCE.getDatabaseVendorDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Predefined Data Type Definitions</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS = eINSTANCE.getDatabaseVendorDefinition_PredefinedDataTypeDefinitions();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Space Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__TABLE_SPACE_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_TableSpaceDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Stored Procedure Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_StoredProcedureDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Trigger Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__TRIGGER_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_TriggerDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Column Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__COLUMN_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_ColumnDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Constraint Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__CONSTRAINT_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_ConstraintDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Extended Definitions</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__EXTENDED_DEFINITIONS = eINSTANCE.getDatabaseVendorDefinition_ExtendedDefinitions();
+
+		/**
+		 * The meta object literal for the '<em><b>Index Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__INDEX_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_IndexDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__TABLE_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_TableDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Sequence Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__SEQUENCE_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_SequenceDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Udt Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__UDT_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_UdtDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Query Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__QUERY_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_QueryDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>SQL Syntax Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__SQL_SYNTAX_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_SQLSyntaxDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Nickname Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__NICKNAME_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_NicknameDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Schema Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__SCHEMA_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_SchemaDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>View Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__VIEW_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_ViewDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Debugger Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABASE_VENDOR_DEFINITION__DEBUGGER_DEFINITION = eINSTANCE.getDatabaseVendorDefinition_DebuggerDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Vendor</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__VENDOR = eINSTANCE.getDatabaseVendorDefinition_Vendor();
+
+		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__VERSION = eINSTANCE.getDatabaseVendorDefinition_Version();
+
+		/**
+		 * The meta object literal for the '<em><b>Constraints Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__CONSTRAINTS_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_ConstraintsSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = eINSTANCE.getDatabaseVendorDefinition_MaximumIdentifierLength();
+
+		/**
+		 * The meta object literal for the '<em><b>Trigger Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__TRIGGER_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_TriggerSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Snapshot View Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__SNAPSHOT_VIEW_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_SnapshotViewSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Join Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__JOIN_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_JoinSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>View Trigger Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__VIEW_TRIGGER_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_ViewTriggerSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Tablespaces Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__TABLESPACES_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_TablespacesSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Comment Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__MAXIMUM_COMMENT_LENGTH = eINSTANCE.getDatabaseVendorDefinition_MaximumCommentLength();
+
+		/**
+		 * The meta object literal for the '<em><b>Sequence Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__SEQUENCE_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_SequenceSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>MQT Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__MQT_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_MQTSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Schema Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__SCHEMA_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_SchemaSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Alias Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__ALIAS_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_AliasSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Synonym Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__SYNONYM_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_SynonymSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>User Defined Type Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__USER_DEFINED_TYPE_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_UserDefinedTypeSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Domain Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__DOMAIN_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_DomainSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>SQL Statement Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__SQL_STATEMENT_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_SQLStatementSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Nickname Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__NICKNAME_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_NicknameSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Quoted DML Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__QUOTED_DML_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_QuotedDMLSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Quoted DDL Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__QUOTED_DDL_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_QuotedDDLSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Xml Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__XML_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_XmlSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>MQT Index Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__MQT_INDEX_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_MQTIndexSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Event Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__EVENT_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_EventSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Sql UDF Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__SQL_UDF_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_SqlUDFSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Stored Procedure Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_SUPPORTED = eINSTANCE.getDatabaseVendorDefinition_StoredProcedureSupported();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.PredefinedDataTypeDefinitionImpl <em>Predefined Data Type Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.PredefinedDataTypeDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getPredefinedDataTypeDefinition()
+		 * @generated
+		 */
+		EClass PREDEFINED_DATA_TYPE_DEFINITION = eINSTANCE.getPredefinedDataTypeDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Leading Field Qualifier Definition</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PREDEFINED_DATA_TYPE_DEFINITION__LEADING_FIELD_QUALIFIER_DEFINITION = eINSTANCE.getPredefinedDataTypeDefinition_LeadingFieldQualifierDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Trailing Field Qualifier Definition</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PREDEFINED_DATA_TYPE_DEFINITION__TRAILING_FIELD_QUALIFIER_DEFINITION = eINSTANCE.getPredefinedDataTypeDefinition_TrailingFieldQualifierDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Trailing Field Qualifier Definition</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PREDEFINED_DATA_TYPE_DEFINITION__DEFAULT_TRAILING_FIELD_QUALIFIER_DEFINITION = eINSTANCE.getPredefinedDataTypeDefinition_DefaultTrailingFieldQualifierDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Leading Field Qualifier Definition</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PREDEFINED_DATA_TYPE_DEFINITION__DEFAULT_LEADING_FIELD_QUALIFIER_DEFINITION = eINSTANCE.getPredefinedDataTypeDefinition_DefaultLeadingFieldQualifierDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Length Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__LENGTH_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_LengthSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Scale Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__SCALE_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_ScaleSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Precision Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__PRECISION_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_PrecisionSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Key Constraint Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__KEY_CONSTRAINT_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_KeyConstraintSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Identity Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__IDENTITY_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_IdentitySupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Multiple Columns Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__MULTIPLE_COLUMNS_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_MultipleColumnsSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Nullable Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__NULLABLE_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_NullableSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__DEFAULT_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_DefaultSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Clustering Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__CLUSTERING_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_ClusteringSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Fill Factor Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__FILL_FACTOR_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_FillFactorSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Bit Data Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__BIT_DATA_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_BitDataSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__MAXIMUM_VALUE = eINSTANCE.getPredefinedDataTypeDefinition_MaximumValue();
+
+		/**
+		 * The meta object literal for the '<em><b>Minimum Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__MINIMUM_VALUE = eINSTANCE.getPredefinedDataTypeDefinition_MinimumValue();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__MAXIMUM_LENGTH = eINSTANCE.getPredefinedDataTypeDefinition_MaximumLength();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Precision</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__MAXIMUM_PRECISION = eINSTANCE.getPredefinedDataTypeDefinition_MaximumPrecision();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Scale</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__MAXIMUM_SCALE = eINSTANCE.getPredefinedDataTypeDefinition_MaximumScale();
+
+		/**
+		 * The meta object literal for the '<em><b>Minimum Scale</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__MINIMUM_SCALE = eINSTANCE.getPredefinedDataTypeDefinition_MinimumScale();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Value Types</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__DEFAULT_VALUE_TYPES = eINSTANCE.getPredefinedDataTypeDefinition_DefaultValueTypes();
+
+		/**
+		 * The meta object literal for the '<em><b>Primitive Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__PRIMITIVE_TYPE = eINSTANCE.getPredefinedDataTypeDefinition_PrimitiveType();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__NAME = eINSTANCE.getPredefinedDataTypeDefinition_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Jdbc Enum Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__JDBC_ENUM_TYPE = eINSTANCE.getPredefinedDataTypeDefinition_JdbcEnumType();
+
+		/**
+		 * The meta object literal for the '<em><b>Character Set</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__CHARACTER_SET = eINSTANCE.getPredefinedDataTypeDefinition_CharacterSet();
+
+		/**
+		 * The meta object literal for the '<em><b>Encoding Scheme</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__ENCODING_SCHEME = eINSTANCE.getPredefinedDataTypeDefinition_EncodingScheme();
+
+		/**
+		 * The meta object literal for the '<em><b>Character Set Suffix</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__CHARACTER_SET_SUFFIX = eINSTANCE.getPredefinedDataTypeDefinition_CharacterSetSuffix();
+
+		/**
+		 * The meta object literal for the '<em><b>Encoding Scheme Suffix</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__ENCODING_SCHEME_SUFFIX = eINSTANCE.getPredefinedDataTypeDefinition_EncodingSchemeSuffix();
+
+		/**
+		 * The meta object literal for the '<em><b>Java Class Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__JAVA_CLASS_NAME = eINSTANCE.getPredefinedDataTypeDefinition_JavaClassName();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__DEFAULT_LENGTH = eINSTANCE.getPredefinedDataTypeDefinition_DefaultLength();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Precision</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__DEFAULT_PRECISION = eINSTANCE.getPredefinedDataTypeDefinition_DefaultPrecision();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Scale</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__DEFAULT_SCALE = eINSTANCE.getPredefinedDataTypeDefinition_DefaultScale();
+
+		/**
+		 * The meta object literal for the '<em><b>Cutoff Precision</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__CUTOFF_PRECISION = eINSTANCE.getPredefinedDataTypeDefinition_CutoffPrecision();
+
+		/**
+		 * The meta object literal for the '<em><b>Length Unit</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__LENGTH_UNIT = eINSTANCE.getPredefinedDataTypeDefinition_LengthUnit();
+
+		/**
+		 * The meta object literal for the '<em><b>Ordering Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__ORDERING_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_OrderingSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Grouping Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__GROUPING_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_GroupingSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__DISPLAY_NAME = eINSTANCE.getPredefinedDataTypeDefinition_DisplayName();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Name Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__DISPLAY_NAME_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_DisplayNameSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Leading Field Qualifier Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__LEADING_FIELD_QUALIFIER_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_LeadingFieldQualifierSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Trailing Field Qualifier Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__TRAILING_FIELD_QUALIFIER_SUPPORTED = eINSTANCE.getPredefinedDataTypeDefinition_TrailingFieldQualifierSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Field Qualifier Separator</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PREDEFINED_DATA_TYPE_DEFINITION__FIELD_QUALIFIER_SEPARATOR = eINSTANCE.getPredefinedDataTypeDefinition_FieldQualifierSeparator();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.TableSpaceDefinitionImpl <em>Table Space Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.TableSpaceDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getTableSpaceDefinition()
+		 * @generated
+		 */
+		EClass TABLE_SPACE_DEFINITION = eINSTANCE.getTableSpaceDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Type Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_SPACE_DEFINITION__TYPE_SUPPORTED = eINSTANCE.getTableSpaceDefinition_TypeSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Extent Size Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_SPACE_DEFINITION__EXTENT_SIZE_SUPPORTED = eINSTANCE.getTableSpaceDefinition_ExtentSizeSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Prefetch Size Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_SPACE_DEFINITION__PREFETCH_SIZE_SUPPORTED = eINSTANCE.getTableSpaceDefinition_PrefetchSizeSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Managed By Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_SPACE_DEFINITION__MANAGED_BY_SUPPORTED = eINSTANCE.getTableSpaceDefinition_ManagedBySupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Page Size Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_SPACE_DEFINITION__PAGE_SIZE_SUPPORTED = eINSTANCE.getTableSpaceDefinition_PageSizeSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Buffer Pool Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_SPACE_DEFINITION__BUFFER_POOL_SUPPORTED = eINSTANCE.getTableSpaceDefinition_BufferPoolSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_SPACE_DEFINITION__DEFAULT_SUPPORTED = eINSTANCE.getTableSpaceDefinition_DefaultSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Container Maximum Size Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_SPACE_DEFINITION__CONTAINER_MAXIMUM_SIZE_SUPPORTED = eINSTANCE.getTableSpaceDefinition_ContainerMaximumSizeSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Container Initial Size Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_SPACE_DEFINITION__CONTAINER_INITIAL_SIZE_SUPPORTED = eINSTANCE.getTableSpaceDefinition_ContainerInitialSizeSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Container Extent Size Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_SPACE_DEFINITION__CONTAINER_EXTENT_SIZE_SUPPORTED = eINSTANCE.getTableSpaceDefinition_ContainerExtentSizeSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Space Type</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_SPACE_DEFINITION__TABLE_SPACE_TYPE = eINSTANCE.getTableSpaceDefinition_TableSpaceType();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_SPACE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = eINSTANCE.getTableSpaceDefinition_MaximumIdentifierLength();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.StoredProcedureDefinitionImpl <em>Stored Procedure Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.StoredProcedureDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getStoredProcedureDefinition()
+		 * @generated
+		 */
+		EClass STORED_PROCEDURE_DEFINITION = eINSTANCE.getStoredProcedureDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Null Input Action Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__NULL_INPUT_ACTION_SUPPORTED = eINSTANCE.getStoredProcedureDefinition_NullInputActionSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Package Generation Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__PACKAGE_GENERATION_SUPPORTED = eINSTANCE.getStoredProcedureDefinition_PackageGenerationSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Determininstic Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__DETERMININSTIC_SUPPORTED = eINSTANCE.getStoredProcedureDefinition_DetermininsticSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Returned Null Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__RETURNED_NULL_SUPPORTED = eINSTANCE.getStoredProcedureDefinition_ReturnedNullSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Returned Type Declaration Constraint Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__RETURNED_TYPE_DECLARATION_CONSTRAINT_SUPPORTED = eINSTANCE.getStoredProcedureDefinition_ReturnedTypeDeclarationConstraintSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Parameter Init Value Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__PARAMETER_INIT_VALUE_SUPPORTED = eINSTANCE.getStoredProcedureDefinition_ParameterInitValueSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Parameter Style Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__PARAMETER_STYLE_SUPPORTED = eINSTANCE.getStoredProcedureDefinition_ParameterStyleSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Return Type Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__RETURN_TYPE_SUPPORTED = eINSTANCE.getStoredProcedureDefinition_ReturnTypeSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Parameter Declaration Constraint Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__PARAMETER_DECLARATION_CONSTRAINT_SUPPORTED = eINSTANCE.getStoredProcedureDefinition_ParameterDeclarationConstraintSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Action Body Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__MAXIMUM_ACTION_BODY_LENGTH = eINSTANCE.getStoredProcedureDefinition_MaximumActionBodyLength();
+
+		/**
+		 * The meta object literal for the '<em><b>Parameter Style</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__PARAMETER_STYLE = eINSTANCE.getStoredProcedureDefinition_ParameterStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Language Type</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__LANGUAGE_TYPE = eINSTANCE.getStoredProcedureDefinition_LanguageType();
+
+		/**
+		 * The meta object literal for the '<em><b>Function Language Type</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__FUNCTION_LANGUAGE_TYPE = eINSTANCE.getStoredProcedureDefinition_FunctionLanguageType();
+
+		/**
+		 * The meta object literal for the '<em><b>Procedure Type</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__PROCEDURE_TYPE = eINSTANCE.getStoredProcedureDefinition_ProcedureType();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STORED_PROCEDURE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = eINSTANCE.getStoredProcedureDefinition_MaximumIdentifierLength();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.TriggerDefinitionImpl <em>Trigger Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.TriggerDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getTriggerDefinition()
+		 * @generated
+		 */
+		EClass TRIGGER_DEFINITION = eINSTANCE.getTriggerDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Reference Part Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TRIGGER_DEFINITION__MAXIMUM_REFERENCE_PART_LENGTH = eINSTANCE.getTriggerDefinition_MaximumReferencePartLength();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Action Body Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TRIGGER_DEFINITION__MAXIMUM_ACTION_BODY_LENGTH = eINSTANCE.getTriggerDefinition_MaximumActionBodyLength();
+
+		/**
+		 * The meta object literal for the '<em><b>Type Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TRIGGER_DEFINITION__TYPE_SUPPORTED = eINSTANCE.getTriggerDefinition_TypeSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>When Clause Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TRIGGER_DEFINITION__WHEN_CLAUSE_SUPPORTED = eINSTANCE.getTriggerDefinition_WhenClauseSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Granularity Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TRIGGER_DEFINITION__GRANULARITY_SUPPORTED = eINSTANCE.getTriggerDefinition_GranularitySupported();
+
+		/**
+		 * The meta object literal for the '<em><b>References Clause Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TRIGGER_DEFINITION__REFERENCES_CLAUSE_SUPPORTED = eINSTANCE.getTriggerDefinition_ReferencesClauseSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Per Column Update Trigger Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TRIGGER_DEFINITION__PER_COLUMN_UPDATE_TRIGGER_SUPPORTED = eINSTANCE.getTriggerDefinition_PerColumnUpdateTriggerSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Instead Of Trigger Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TRIGGER_DEFINITION__INSTEAD_OF_TRIGGER_SUPPORTED = eINSTANCE.getTriggerDefinition_InsteadOfTriggerSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Row Trigger Reference Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TRIGGER_DEFINITION__ROW_TRIGGER_REFERENCE_SUPPORTED = eINSTANCE.getTriggerDefinition_RowTriggerReferenceSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Trigger Reference Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TRIGGER_DEFINITION__TABLE_TRIGGER_REFERENCE_SUPPORTED = eINSTANCE.getTriggerDefinition_TableTriggerReferenceSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TRIGGER_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = eINSTANCE.getTriggerDefinition_MaximumIdentifierLength();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.ColumnDefinitionImpl <em>Column Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.ColumnDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getColumnDefinition()
+		 * @generated
+		 */
+		EClass COLUMN_DEFINITION = eINSTANCE.getColumnDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Identity Column Data Type Definitions</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COLUMN_DEFINITION__IDENTITY_COLUMN_DATA_TYPE_DEFINITIONS = eINSTANCE.getColumnDefinition_IdentityColumnDataTypeDefinitions();
+
+		/**
+		 * The meta object literal for the '<em><b>Identity Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COLUMN_DEFINITION__IDENTITY_SUPPORTED = eINSTANCE.getColumnDefinition_IdentitySupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Computed Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COLUMN_DEFINITION__COMPUTED_SUPPORTED = eINSTANCE.getColumnDefinition_ComputedSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Identity Start Value Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COLUMN_DEFINITION__IDENTITY_START_VALUE_SUPPORTED = eINSTANCE.getColumnDefinition_IdentityStartValueSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Identity Increment Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COLUMN_DEFINITION__IDENTITY_INCREMENT_SUPPORTED = eINSTANCE.getColumnDefinition_IdentityIncrementSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Identity Minimum Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COLUMN_DEFINITION__IDENTITY_MINIMUM_SUPPORTED = eINSTANCE.getColumnDefinition_IdentityMinimumSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Identity Maximum Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COLUMN_DEFINITION__IDENTITY_MAXIMUM_SUPPORTED = eINSTANCE.getColumnDefinition_IdentityMaximumSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Identity Cycle Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COLUMN_DEFINITION__IDENTITY_CYCLE_SUPPORTED = eINSTANCE.getColumnDefinition_IdentityCycleSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COLUMN_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = eINSTANCE.getColumnDefinition_MaximumIdentifierLength();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.ConstraintDefinitionImpl <em>Constraint Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.ConstraintDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getConstraintDefinition()
+		 * @generated
+		 */
+		EClass CONSTRAINT_DEFINITION = eINSTANCE.getConstraintDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Deferrable Constraint Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__DEFERRABLE_CONSTRAINT_SUPPORTED = eINSTANCE.getConstraintDefinition_DeferrableConstraintSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Informational Constraint Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__INFORMATIONAL_CONSTRAINT_SUPPORTED = eINSTANCE.getConstraintDefinition_InformationalConstraintSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Clustered Primary Key Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__CLUSTERED_PRIMARY_KEY_SUPPORTED = eINSTANCE.getConstraintDefinition_ClusteredPrimaryKeySupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Clustered Unique Constraint Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__CLUSTERED_UNIQUE_CONSTRAINT_SUPPORTED = eINSTANCE.getConstraintDefinition_ClusteredUniqueConstraintSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Primary Key Nullable</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__PRIMARY_KEY_NULLABLE = eINSTANCE.getConstraintDefinition_PrimaryKeyNullable();
+
+		/**
+		 * The meta object literal for the '<em><b>Unique Key Nullable</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__UNIQUE_KEY_NULLABLE = eINSTANCE.getConstraintDefinition_UniqueKeyNullable();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Check Expression Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__MAXIMUM_CHECK_EXPRESSION_LENGTH = eINSTANCE.getConstraintDefinition_MaximumCheckExpressionLength();
+
+		/**
+		 * The meta object literal for the '<em><b>Parent Update DRI Rule Type</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__PARENT_UPDATE_DRI_RULE_TYPE = eINSTANCE.getConstraintDefinition_ParentUpdateDRIRuleType();
+
+		/**
+		 * The meta object literal for the '<em><b>Parent Delete DRI Rule Type</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__PARENT_DELETE_DRI_RULE_TYPE = eINSTANCE.getConstraintDefinition_ParentDeleteDRIRuleType();
+
+		/**
+		 * The meta object literal for the '<em><b>Check Option</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__CHECK_OPTION = eINSTANCE.getConstraintDefinition_CheckOption();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Primary Key Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__MAXIMUM_PRIMARY_KEY_IDENTIFIER_LENGTH = eINSTANCE.getConstraintDefinition_MaximumPrimaryKeyIdentifierLength();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Foreign Key Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__MAXIMUM_FOREIGN_KEY_IDENTIFIER_LENGTH = eINSTANCE.getConstraintDefinition_MaximumForeignKeyIdentifierLength();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Check Constraint Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DEFINITION__MAXIMUM_CHECK_CONSTRAINT_IDENTIFIER_LENGTH = eINSTANCE.getConstraintDefinition_MaximumCheckConstraintIdentifierLength();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.IndexDefinitionImpl <em>Index Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.IndexDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getIndexDefinition()
+		 * @generated
+		 */
+		EClass INDEX_DEFINITION = eINSTANCE.getIndexDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Percent Free Terminology</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INDEX_DEFINITION__PERCENT_FREE_TERMINOLOGY = eINSTANCE.getIndexDefinition_PercentFreeTerminology();
+
+		/**
+		 * The meta object literal for the '<em><b>Percent Free Changeable</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INDEX_DEFINITION__PERCENT_FREE_CHANGEABLE = eINSTANCE.getIndexDefinition_PercentFreeChangeable();
+
+		/**
+		 * The meta object literal for the '<em><b>Clustering Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INDEX_DEFINITION__CLUSTERING_SUPPORTED = eINSTANCE.getIndexDefinition_ClusteringSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Cluster Changeable</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INDEX_DEFINITION__CLUSTER_CHANGEABLE = eINSTANCE.getIndexDefinition_ClusterChangeable();
+
+		/**
+		 * The meta object literal for the '<em><b>Fill Factor Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INDEX_DEFINITION__FILL_FACTOR_SUPPORTED = eINSTANCE.getIndexDefinition_FillFactorSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Included Columns Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INDEX_DEFINITION__INCLUDED_COLUMNS_SUPPORTED = eINSTANCE.getIndexDefinition_IncludedColumnsSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INDEX_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = eINSTANCE.getIndexDefinition_MaximumIdentifierLength();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.ExtendedDefinitionImpl <em>Extended Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.ExtendedDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getExtendedDefinition()
+		 * @generated
+		 */
+		EClass EXTENDED_DEFINITION = eINSTANCE.getExtendedDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXTENDED_DEFINITION__NAME = eINSTANCE.getExtendedDefinition_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXTENDED_DEFINITION__VALUE = eINSTANCE.getExtendedDefinition_Value();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.TableDefinitionImpl <em>Table Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.TableDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getTableDefinition()
+		 * @generated
+		 */
+		EClass TABLE_DEFINITION = eINSTANCE.getTableDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Audit Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_DEFINITION__AUDIT_SUPPORTED = eINSTANCE.getTableDefinition_AuditSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Data Capture Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_DEFINITION__DATA_CAPTURE_SUPPORTED = eINSTANCE.getTableDefinition_DataCaptureSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Edit Proc Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_DEFINITION__EDIT_PROC_SUPPORTED = eINSTANCE.getTableDefinition_EditProcSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Encoding Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_DEFINITION__ENCODING_SUPPORTED = eINSTANCE.getTableDefinition_EncodingSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Valid Proc Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_DEFINITION__VALID_PROC_SUPPORTED = eINSTANCE.getTableDefinition_ValidProcSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = eINSTANCE.getTableDefinition_MaximumIdentifierLength();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.SequenceDefinitionImpl <em>Sequence Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.SequenceDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getSequenceDefinition()
+		 * @generated
+		 */
+		EClass SEQUENCE_DEFINITION = eINSTANCE.getSequenceDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Predefined Data Type Definitions</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SEQUENCE_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS = eINSTANCE.getSequenceDefinition_PredefinedDataTypeDefinitions();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Data Type Definition</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SEQUENCE_DEFINITION__DEFAULT_DATA_TYPE_DEFINITION = eINSTANCE.getSequenceDefinition_DefaultDataTypeDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Type Enumeration Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SEQUENCE_DEFINITION__TYPE_ENUMERATION_SUPPORTED = eINSTANCE.getSequenceDefinition_TypeEnumerationSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Cache Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SEQUENCE_DEFINITION__CACHE_SUPPORTED = eINSTANCE.getSequenceDefinition_CacheSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Order Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SEQUENCE_DEFINITION__ORDER_SUPPORTED = eINSTANCE.getSequenceDefinition_OrderSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>No Maximum Value String</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SEQUENCE_DEFINITION__NO_MAXIMUM_VALUE_STRING = eINSTANCE.getSequenceDefinition_NoMaximumValueString();
+
+		/**
+		 * The meta object literal for the '<em><b>No Minimum Value String</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SEQUENCE_DEFINITION__NO_MINIMUM_VALUE_STRING = eINSTANCE.getSequenceDefinition_NoMinimumValueString();
+
+		/**
+		 * The meta object literal for the '<em><b>No Cache String</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SEQUENCE_DEFINITION__NO_CACHE_STRING = eINSTANCE.getSequenceDefinition_NoCacheString();
+
+		/**
+		 * The meta object literal for the '<em><b>Cache Default Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SEQUENCE_DEFINITION__CACHE_DEFAULT_VALUE = eINSTANCE.getSequenceDefinition_CacheDefaultValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.UserDefinedTypeDefinitionImpl <em>User Defined Type Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.UserDefinedTypeDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getUserDefinedTypeDefinition()
+		 * @generated
+		 */
+		EClass USER_DEFINED_TYPE_DEFINITION = eINSTANCE.getUserDefinedTypeDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Value Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute USER_DEFINED_TYPE_DEFINITION__DEFAULT_VALUE_SUPPORTED = eINSTANCE.getUserDefinedTypeDefinition_DefaultValueSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Distinct Type Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute USER_DEFINED_TYPE_DEFINITION__DISTINCT_TYPE_SUPPORTED = eINSTANCE.getUserDefinedTypeDefinition_DistinctTypeSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Structured Type Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute USER_DEFINED_TYPE_DEFINITION__STRUCTURED_TYPE_SUPPORTED = eINSTANCE.getUserDefinedTypeDefinition_StructuredTypeSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute USER_DEFINED_TYPE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = eINSTANCE.getUserDefinedTypeDefinition_MaximumIdentifierLength();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.QueryDefinitionImpl <em>Query Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.QueryDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getQueryDefinition()
+		 * @generated
+		 */
+		EClass QUERY_DEFINITION = eINSTANCE.getQueryDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Identifier Quote String</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute QUERY_DEFINITION__IDENTIFIER_QUOTE_STRING = eINSTANCE.getQueryDefinition_IdentifierQuoteString();
+
+		/**
+		 * The meta object literal for the '<em><b>Host Variable Marker</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute QUERY_DEFINITION__HOST_VARIABLE_MARKER = eINSTANCE.getQueryDefinition_HostVariableMarker();
+
+		/**
+		 * The meta object literal for the '<em><b>Host Variable Marker Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute QUERY_DEFINITION__HOST_VARIABLE_MARKER_SUPPORTED = eINSTANCE.getQueryDefinition_HostVariableMarkerSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Cast Expression Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute QUERY_DEFINITION__CAST_EXPRESSION_SUPPORTED = eINSTANCE.getQueryDefinition_CastExpressionSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Keyword For Insert Value Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute QUERY_DEFINITION__DEFAULT_KEYWORD_FOR_INSERT_VALUE_SUPPORTED = eINSTANCE.getQueryDefinition_DefaultKeywordForInsertValueSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Extended Grouping Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute QUERY_DEFINITION__EXTENDED_GROUPING_SUPPORTED = eINSTANCE.getQueryDefinition_ExtendedGroupingSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Alias In Delete Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute QUERY_DEFINITION__TABLE_ALIAS_IN_DELETE_SUPPORTED = eINSTANCE.getQueryDefinition_TableAliasInDeleteSupported();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.SQLSyntaxDefinitionImpl <em>SQL Syntax Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.SQLSyntaxDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getSQLSyntaxDefinition()
+		 * @generated
+		 */
+		EClass SQL_SYNTAX_DEFINITION = eINSTANCE.getSQLSyntaxDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Keywords</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SQL_SYNTAX_DEFINITION__KEYWORDS = eINSTANCE.getSQLSyntaxDefinition_Keywords();
+
+		/**
+		 * The meta object literal for the '<em><b>Operators</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SQL_SYNTAX_DEFINITION__OPERATORS = eINSTANCE.getSQLSyntaxDefinition_Operators();
+
+		/**
+		 * The meta object literal for the '<em><b>Termination Character</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SQL_SYNTAX_DEFINITION__TERMINATION_CHARACTER = eINSTANCE.getSQLSyntaxDefinition_TerminationCharacter();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.NicknameDefinitionImpl <em>Nickname Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.NicknameDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getNicknameDefinition()
+		 * @generated
+		 */
+		EClass NICKNAME_DEFINITION = eINSTANCE.getNicknameDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Constraint Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute NICKNAME_DEFINITION__CONSTRAINT_SUPPORTED = eINSTANCE.getNicknameDefinition_ConstraintSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Index Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute NICKNAME_DEFINITION__INDEX_SUPPORTED = eINSTANCE.getNicknameDefinition_IndexSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute NICKNAME_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = eINSTANCE.getNicknameDefinition_MaximumIdentifierLength();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.SchemaDefinitionImpl <em>Schema Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.SchemaDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getSchemaDefinition()
+		 * @generated
+		 */
+		EClass SCHEMA_DEFINITION = eINSTANCE.getSchemaDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SCHEMA_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = eINSTANCE.getSchemaDefinition_MaximumIdentifierLength();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.ViewDefinitionImpl <em>View Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.ViewDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getViewDefinition()
+		 * @generated
+		 */
+		EClass VIEW_DEFINITION = eINSTANCE.getViewDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Identifier Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute VIEW_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH = eINSTANCE.getViewDefinition_MaximumIdentifierLength();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.FieldQualifierDefinitionImpl <em>Field Qualifier Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.FieldQualifierDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getFieldQualifierDefinition()
+		 * @generated
+		 */
+		EClass FIELD_QUALIFIER_DEFINITION = eINSTANCE.getFieldQualifierDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Valid Trailing Field Qualifier Definitions</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FIELD_QUALIFIER_DEFINITION__VALID_TRAILING_FIELD_QUALIFIER_DEFINITIONS = eINSTANCE.getFieldQualifierDefinition_ValidTrailingFieldQualifierDefinitions();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FIELD_QUALIFIER_DEFINITION__NAME = eINSTANCE.getFieldQualifierDefinition_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Precision</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FIELD_QUALIFIER_DEFINITION__MAXIMUM_PRECISION = eINSTANCE.getFieldQualifierDefinition_MaximumPrecision();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Precision</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FIELD_QUALIFIER_DEFINITION__DEFAULT_PRECISION = eINSTANCE.getFieldQualifierDefinition_DefaultPrecision();
+
+		/**
+		 * The meta object literal for the '<em><b>Precision Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FIELD_QUALIFIER_DEFINITION__PRECISION_SUPPORTED = eINSTANCE.getFieldQualifierDefinition_PrecisionSupported();
+
+		/**
+		 * The meta object literal for the '<em><b>Maximum Scale</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FIELD_QUALIFIER_DEFINITION__MAXIMUM_SCALE = eINSTANCE.getFieldQualifierDefinition_MaximumScale();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Scale</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FIELD_QUALIFIER_DEFINITION__DEFAULT_SCALE = eINSTANCE.getFieldQualifierDefinition_DefaultScale();
+
+		/**
+		 * The meta object literal for the '<em><b>Scale Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FIELD_QUALIFIER_DEFINITION__SCALE_SUPPORTED = eINSTANCE.getFieldQualifierDefinition_ScaleSupported();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.impl.DebuggerDefinitionImpl <em>Debugger Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DebuggerDefinitionImpl
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getDebuggerDefinition()
+		 * @generated
+		 */
+		EClass DEBUGGER_DEFINITION = eINSTANCE.getDebuggerDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Condition Supported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DEBUGGER_DEFINITION__CONDITION_SUPPORTED = eINSTANCE.getDebuggerDefinition_ConditionSupported();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.CheckOption <em>Check Option</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.CheckOption
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getCheckOption()
+		 * @generated
+		 */
+		EEnum CHECK_OPTION = eINSTANCE.getCheckOption();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.LanguageType <em>Language Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.LanguageType
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getLanguageType()
+		 * @generated
+		 */
+		EEnum LANGUAGE_TYPE = eINSTANCE.getLanguageType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.ParameterStyle <em>Parameter Style</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.ParameterStyle
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getParameterStyle()
+		 * @generated
+		 */
+		EEnum PARAMETER_STYLE = eINSTANCE.getParameterStyle();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.ParentDeleteDRIRuleType <em>Parent Delete DRI Rule Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.ParentDeleteDRIRuleType
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getParentDeleteDRIRuleType()
+		 * @generated
+		 */
+		EEnum PARENT_DELETE_DRI_RULE_TYPE = eINSTANCE.getParentDeleteDRIRuleType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.ParentUpdateDRIRuleType <em>Parent Update DRI Rule Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.ParentUpdateDRIRuleType
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getParentUpdateDRIRuleType()
+		 * @generated
+		 */
+		EEnum PARENT_UPDATE_DRI_RULE_TYPE = eINSTANCE.getParentUpdateDRIRuleType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.ProcedureType <em>Procedure Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.ProcedureType
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getProcedureType()
+		 * @generated
+		 */
+		EEnum PROCEDURE_TYPE = eINSTANCE.getProcedureType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.TableSpaceType <em>Table Space Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.TableSpaceType
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getTableSpaceType()
+		 * @generated
+		 */
+		EEnum TABLE_SPACE_TYPE = eINSTANCE.getTableSpaceType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.PercentFreeTerminology <em>Percent Free Terminology</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.PercentFreeTerminology
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getPercentFreeTerminology()
+		 * @generated
+		 */
+		EEnum PERCENT_FREE_TERMINOLOGY = eINSTANCE.getPercentFreeTerminology();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.datatools.modelbase.dbdefinition.LengthUnit <em>Length Unit</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.LengthUnit
+		 * @see org.eclipse.datatools.modelbase.dbdefinition.impl.DatabaseDefinitionPackageImpl#getLengthUnit()
+		 * @generated
+		 */
+		EEnum LENGTH_UNIT = eINSTANCE.getLengthUnit();
+
+	}
+
 } //DatabaseDefinitionPackage
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/LanguageType.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/LanguageType.java
index 9007900..42882b3 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/LanguageType.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/LanguageType.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: LanguageType.java,v 1.1 2005/08/02 22:56:24 ledunnel Exp $
+ * $Id: LanguageType.java,v 1.2 2005/12/22 23:32:56 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition;
 
@@ -188,7 +188,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType SQL_LITERAL = new LanguageType(SQL, "SQL"); //$NON-NLS-1$
+	public static final LanguageType SQL_LITERAL = new LanguageType(SQL, "SQL", "SQL"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>JAVA</b></em>' literal object.
@@ -202,7 +202,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType JAVA_LITERAL = new LanguageType(JAVA, "JAVA"); //$NON-NLS-1$
+	public static final LanguageType JAVA_LITERAL = new LanguageType(JAVA, "JAVA", "JAVA"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>C</b></em>' literal object.
@@ -216,7 +216,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType C_LITERAL = new LanguageType(C, "C"); //$NON-NLS-1$
+	public static final LanguageType C_LITERAL = new LanguageType(C, "C", "C"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>OLE</b></em>' literal object.
@@ -230,7 +230,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType OLE_LITERAL = new LanguageType(OLE, "OLE"); //$NON-NLS-1$
+	public static final LanguageType OLE_LITERAL = new LanguageType(OLE, "OLE", "OLE"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>ASSEMBLY</b></em>' literal object.
@@ -244,7 +244,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType ASSEMBLY_LITERAL = new LanguageType(ASSEMBLY, "ASSEMBLY"); //$NON-NLS-1$
+	public static final LanguageType ASSEMBLY_LITERAL = new LanguageType(ASSEMBLY, "ASSEMBLY", "ASSEMBLY"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>COBOL</b></em>' literal object.
@@ -258,7 +258,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType COBOL_LITERAL = new LanguageType(COBOL, "COBOL"); //$NON-NLS-1$
+	public static final LanguageType COBOL_LITERAL = new LanguageType(COBOL, "COBOL", "COBOL"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>PLI</b></em>' literal object.
@@ -272,7 +272,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType PLI_LITERAL = new LanguageType(PLI, "PLI"); //$NON-NLS-1$
+	public static final LanguageType PLI_LITERAL = new LanguageType(PLI, "PLI", "PLI"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>CPLUSPLUS</b></em>' literal object.
@@ -286,7 +286,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType CPLUSPLUS_LITERAL = new LanguageType(CPLUSPLUS, "CPLUSPLUS"); //$NON-NLS-1$
+	public static final LanguageType CPLUSPLUS_LITERAL = new LanguageType(CPLUSPLUS, "CPLUSPLUS", "CPLUSPLUS"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>CL</b></em>' literal object.
@@ -300,7 +300,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType CL_LITERAL = new LanguageType(CL, "CL"); //$NON-NLS-1$
+	public static final LanguageType CL_LITERAL = new LanguageType(CL, "CL", "CL"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>COBOLLE</b></em>' literal object.
@@ -314,7 +314,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType COBOLLE_LITERAL = new LanguageType(COBOLLE, "COBOLLE"); //$NON-NLS-1$
+	public static final LanguageType COBOLLE_LITERAL = new LanguageType(COBOLLE, "COBOLLE", "COBOLLE"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>FORTRAN</b></em>' literal object.
@@ -328,7 +328,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType FORTRAN_LITERAL = new LanguageType(FORTRAN, "FORTRAN"); //$NON-NLS-1$
+	public static final LanguageType FORTRAN_LITERAL = new LanguageType(FORTRAN, "FORTRAN", "FORTRAN"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>REXX</b></em>' literal object.
@@ -342,7 +342,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType REXX_LITERAL = new LanguageType(REXX, "REXX"); //$NON-NLS-1$
+	public static final LanguageType REXX_LITERAL = new LanguageType(REXX, "REXX", "REXX"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>RPG</b></em>' literal object.
@@ -356,7 +356,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType RPG_LITERAL = new LanguageType(RPG, "RPG"); //$NON-NLS-1$
+	public static final LanguageType RPG_LITERAL = new LanguageType(RPG, "RPG", "RPG"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>RPGLE</b></em>' literal object.
@@ -370,7 +370,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LanguageType RPGLE_LITERAL = new LanguageType(RPGLE, "RPGLE"); //$NON-NLS-1$
+	public static final LanguageType RPGLE_LITERAL = new LanguageType(RPGLE, "RPGLE", "RPGLE"); //$NON-NLS-1$
 
 	/**
 	 * An array of all the '<em><b>Language Type</b></em>' enumerators.
@@ -405,15 +405,15 @@
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Language Type</b></em>' literal with the specified name.
+	 * Returns the '<em><b>Language Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static LanguageType get(String name) {
+	public static LanguageType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			LanguageType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -421,7 +421,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Language Type</b></em>' literal with the specified value.
+	 * Returns the '<em><b>Language Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static LanguageType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			LanguageType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Language Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -452,8 +468,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private LanguageType(int value, String name) {
-		super(value, name);
+	private LanguageType(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //LanguageType
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/LengthUnit.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/LengthUnit.java
index c9c2ea3..94f615b 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/LengthUnit.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/LengthUnit.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: LengthUnit.java,v 1.1 2005/08/02 22:56:24 ledunnel Exp $
+ * $Id: LengthUnit.java,v 1.2 2005/12/22 23:32:55 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition;
 
@@ -78,7 +78,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LengthUnit DECIMAL_LITERAL = new LengthUnit(DECIMAL, "DECIMAL"); //$NON-NLS-1$
+	public static final LengthUnit DECIMAL_LITERAL = new LengthUnit(DECIMAL, "DECIMAL", "DECIMAL"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>BIT</b></em>' literal object.
@@ -92,7 +92,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LengthUnit BIT_LITERAL = new LengthUnit(BIT, "BIT"); //$NON-NLS-1$
+	public static final LengthUnit BIT_LITERAL = new LengthUnit(BIT, "BIT", "BIT"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>BYTE</b></em>' literal object.
@@ -106,7 +106,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LengthUnit BYTE_LITERAL = new LengthUnit(BYTE, "BYTE"); //$NON-NLS-1$
+	public static final LengthUnit BYTE_LITERAL = new LengthUnit(BYTE, "BYTE", "BYTE"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>DOUBLE BYTE</b></em>' literal object.
@@ -120,7 +120,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final LengthUnit DOUBLE_BYTE_LITERAL = new LengthUnit(DOUBLE_BYTE, "DOUBLE_BYTE"); //$NON-NLS-1$
+	public static final LengthUnit DOUBLE_BYTE_LITERAL = new LengthUnit(DOUBLE_BYTE, "DOUBLE_BYTE", "DOUBLE_BYTE"); //$NON-NLS-1$
 
 	/**
 	 * An array of all the '<em><b>Length Unit</b></em>' enumerators.
@@ -145,15 +145,15 @@
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Length Unit</b></em>' literal with the specified name.
+	 * Returns the '<em><b>Length Unit</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static LengthUnit get(String name) {
+	public static LengthUnit get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			LengthUnit result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -161,7 +161,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Length Unit</b></em>' literal with the specified value.
+	 * Returns the '<em><b>Length Unit</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static LengthUnit getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			LengthUnit result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Length Unit</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -182,8 +198,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private LengthUnit(int value, String name) {
-		super(value, name);
+	private LengthUnit(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //LengthUnit
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ParameterStyle.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ParameterStyle.java
index c387eb2..6f686b4 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ParameterStyle.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ParameterStyle.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ParameterStyle.java,v 1.1 2005/08/02 22:56:24 ledunnel Exp $
+ * $Id: ParameterStyle.java,v 1.2 2005/12/22 23:32:55 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition;
 
@@ -111,7 +111,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParameterStyle DB2SQL_LITERAL = new ParameterStyle(DB2SQL, "DB2SQL"); //$NON-NLS-1$
+	public static final ParameterStyle DB2SQL_LITERAL = new ParameterStyle(DB2SQL, "DB2SQL", "DB2SQL"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>GENERAL</b></em>' literal object.
@@ -125,7 +125,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParameterStyle GENERAL_LITERAL = new ParameterStyle(GENERAL, "GENERAL"); //$NON-NLS-1$
+	public static final ParameterStyle GENERAL_LITERAL = new ParameterStyle(GENERAL, "GENERAL", "GENERAL"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>GENERAL WITH NULLS</b></em>' literal object.
@@ -139,7 +139,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParameterStyle GENERAL_WITH_NULLS_LITERAL = new ParameterStyle(GENERAL_WITH_NULLS, "GENERAL_WITH_NULLS"); //$NON-NLS-1$
+	public static final ParameterStyle GENERAL_WITH_NULLS_LITERAL = new ParameterStyle(GENERAL_WITH_NULLS, "GENERAL_WITH_NULLS", "GENERAL_WITH_NULLS"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>DB2GENRL</b></em>' literal object.
@@ -153,7 +153,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParameterStyle DB2GENRL_LITERAL = new ParameterStyle(DB2GENRL, "DB2GENRL"); //$NON-NLS-1$
+	public static final ParameterStyle DB2GENRL_LITERAL = new ParameterStyle(DB2GENRL, "DB2GENRL", "DB2GENRL"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>DB2DARI</b></em>' literal object.
@@ -167,7 +167,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParameterStyle DB2DARI_LITERAL = new ParameterStyle(DB2DARI, "DB2DARI"); //$NON-NLS-1$
+	public static final ParameterStyle DB2DARI_LITERAL = new ParameterStyle(DB2DARI, "DB2DARI", "DB2DARI"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>JAVA</b></em>' literal object.
@@ -181,7 +181,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParameterStyle JAVA_LITERAL = new ParameterStyle(JAVA, "JAVA"); //$NON-NLS-1$
+	public static final ParameterStyle JAVA_LITERAL = new ParameterStyle(JAVA, "JAVA", "JAVA"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>SQL</b></em>' literal object.
@@ -195,7 +195,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParameterStyle SQL_LITERAL = new ParameterStyle(SQL, "SQL"); //$NON-NLS-1$
+	public static final ParameterStyle SQL_LITERAL = new ParameterStyle(SQL, "SQL", "SQL"); //$NON-NLS-1$
 
 	/**
 	 * An array of all the '<em><b>Parameter Style</b></em>' enumerators.
@@ -223,15 +223,15 @@
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Parameter Style</b></em>' literal with the specified name.
+	 * Returns the '<em><b>Parameter Style</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static ParameterStyle get(String name) {
+	public static ParameterStyle get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ParameterStyle result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -239,7 +239,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Parameter Style</b></em>' literal with the specified value.
+	 * Returns the '<em><b>Parameter Style</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ParameterStyle getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			ParameterStyle result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Parameter Style</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -263,8 +279,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private ParameterStyle(int value, String name) {
-		super(value, name);
+	private ParameterStyle(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //ParameterStyle
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ParentDeleteDRIRuleType.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ParentDeleteDRIRuleType.java
index 674a6be..286751c 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ParentDeleteDRIRuleType.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ParentDeleteDRIRuleType.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ParentDeleteDRIRuleType.java,v 1.1 2005/08/02 22:56:25 ledunnel Exp $
+ * $Id: ParentDeleteDRIRuleType.java,v 1.2 2005/12/22 23:32:56 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition;
 
@@ -89,7 +89,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParentDeleteDRIRuleType NO_ACTION_LITERAL = new ParentDeleteDRIRuleType(NO_ACTION, "NO_ACTION"); //$NON-NLS-1$
+	public static final ParentDeleteDRIRuleType NO_ACTION_LITERAL = new ParentDeleteDRIRuleType(NO_ACTION, "NO_ACTION", "NO_ACTION"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>RESTRICT</b></em>' literal object.
@@ -103,7 +103,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParentDeleteDRIRuleType RESTRICT_LITERAL = new ParentDeleteDRIRuleType(RESTRICT, "RESTRICT"); //$NON-NLS-1$
+	public static final ParentDeleteDRIRuleType RESTRICT_LITERAL = new ParentDeleteDRIRuleType(RESTRICT, "RESTRICT", "RESTRICT"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>CASCADE</b></em>' literal object.
@@ -117,7 +117,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParentDeleteDRIRuleType CASCADE_LITERAL = new ParentDeleteDRIRuleType(CASCADE, "CASCADE"); //$NON-NLS-1$
+	public static final ParentDeleteDRIRuleType CASCADE_LITERAL = new ParentDeleteDRIRuleType(CASCADE, "CASCADE", "CASCADE"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>SET NULL</b></em>' literal object.
@@ -131,7 +131,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParentDeleteDRIRuleType SET_NULL_LITERAL = new ParentDeleteDRIRuleType(SET_NULL, "SET_NULL"); //$NON-NLS-1$
+	public static final ParentDeleteDRIRuleType SET_NULL_LITERAL = new ParentDeleteDRIRuleType(SET_NULL, "SET_NULL", "SET_NULL"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>SET DEFAULT</b></em>' literal object.
@@ -145,7 +145,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParentDeleteDRIRuleType SET_DEFAULT_LITERAL = new ParentDeleteDRIRuleType(SET_DEFAULT, "SET_DEFAULT"); //$NON-NLS-1$
+	public static final ParentDeleteDRIRuleType SET_DEFAULT_LITERAL = new ParentDeleteDRIRuleType(SET_DEFAULT, "SET_DEFAULT", "SET_DEFAULT"); //$NON-NLS-1$
 
 	/**
 	 * An array of all the '<em><b>Parent Delete DRI Rule Type</b></em>' enumerators.
@@ -171,15 +171,15 @@
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Parent Delete DRI Rule Type</b></em>' literal with the specified name.
+	 * Returns the '<em><b>Parent Delete DRI Rule Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static ParentDeleteDRIRuleType get(String name) {
+	public static ParentDeleteDRIRuleType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ParentDeleteDRIRuleType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -187,7 +187,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Parent Delete DRI Rule Type</b></em>' literal with the specified value.
+	 * Returns the '<em><b>Parent Delete DRI Rule Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ParentDeleteDRIRuleType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			ParentDeleteDRIRuleType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Parent Delete DRI Rule Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -209,8 +225,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private ParentDeleteDRIRuleType(int value, String name) {
-		super(value, name);
+	private ParentDeleteDRIRuleType(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //ParentDeleteDRIRuleType
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ParentUpdateDRIRuleType.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ParentUpdateDRIRuleType.java
index d424ab2..4bb8e58 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ParentUpdateDRIRuleType.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ParentUpdateDRIRuleType.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ParentUpdateDRIRuleType.java,v 1.1 2005/08/02 22:56:24 ledunnel Exp $
+ * $Id: ParentUpdateDRIRuleType.java,v 1.2 2005/12/22 23:32:55 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition;
 
@@ -89,7 +89,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParentUpdateDRIRuleType NO_ACTION_LITERAL = new ParentUpdateDRIRuleType(NO_ACTION, "NO_ACTION"); //$NON-NLS-1$
+	public static final ParentUpdateDRIRuleType NO_ACTION_LITERAL = new ParentUpdateDRIRuleType(NO_ACTION, "NO_ACTION", "NO_ACTION"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>RESTRICT</b></em>' literal object.
@@ -103,7 +103,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParentUpdateDRIRuleType RESTRICT_LITERAL = new ParentUpdateDRIRuleType(RESTRICT, "RESTRICT"); //$NON-NLS-1$
+	public static final ParentUpdateDRIRuleType RESTRICT_LITERAL = new ParentUpdateDRIRuleType(RESTRICT, "RESTRICT", "RESTRICT"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>CASCADE</b></em>' literal object.
@@ -117,7 +117,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParentUpdateDRIRuleType CASCADE_LITERAL = new ParentUpdateDRIRuleType(CASCADE, "CASCADE"); //$NON-NLS-1$
+	public static final ParentUpdateDRIRuleType CASCADE_LITERAL = new ParentUpdateDRIRuleType(CASCADE, "CASCADE", "CASCADE"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>SET NULL</b></em>' literal object.
@@ -131,7 +131,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParentUpdateDRIRuleType SET_NULL_LITERAL = new ParentUpdateDRIRuleType(SET_NULL, "SET_NULL"); //$NON-NLS-1$
+	public static final ParentUpdateDRIRuleType SET_NULL_LITERAL = new ParentUpdateDRIRuleType(SET_NULL, "SET_NULL", "SET_NULL"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>SET DEFAULT</b></em>' literal object.
@@ -145,7 +145,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ParentUpdateDRIRuleType SET_DEFAULT_LITERAL = new ParentUpdateDRIRuleType(SET_DEFAULT, "SET_DEFAULT"); //$NON-NLS-1$
+	public static final ParentUpdateDRIRuleType SET_DEFAULT_LITERAL = new ParentUpdateDRIRuleType(SET_DEFAULT, "SET_DEFAULT", "SET_DEFAULT"); //$NON-NLS-1$
 
 	/**
 	 * An array of all the '<em><b>Parent Update DRI Rule Type</b></em>' enumerators.
@@ -171,15 +171,15 @@
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Parent Update DRI Rule Type</b></em>' literal with the specified name.
+	 * Returns the '<em><b>Parent Update DRI Rule Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static ParentUpdateDRIRuleType get(String name) {
+	public static ParentUpdateDRIRuleType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ParentUpdateDRIRuleType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -187,7 +187,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Parent Update DRI Rule Type</b></em>' literal with the specified value.
+	 * Returns the '<em><b>Parent Update DRI Rule Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ParentUpdateDRIRuleType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			ParentUpdateDRIRuleType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Parent Update DRI Rule Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -209,8 +225,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private ParentUpdateDRIRuleType(int value, String name) {
-		super(value, name);
+	private ParentUpdateDRIRuleType(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //ParentUpdateDRIRuleType
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/PercentFreeTerminology.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/PercentFreeTerminology.java
index 4c92847..9e8a2ce 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/PercentFreeTerminology.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/PercentFreeTerminology.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PercentFreeTerminology.java,v 1.1 2005/08/02 22:56:24 ledunnel Exp $
+ * $Id: PercentFreeTerminology.java,v 1.2 2005/12/22 23:32:55 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition;
 
@@ -67,7 +67,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final PercentFreeTerminology PERCENT_FREE_LITERAL = new PercentFreeTerminology(PERCENT_FREE, "PERCENT_FREE"); //$NON-NLS-1$
+	public static final PercentFreeTerminology PERCENT_FREE_LITERAL = new PercentFreeTerminology(PERCENT_FREE, "PERCENT_FREE", "PERCENT_FREE"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>FILL FACTOR</b></em>' literal object.
@@ -81,7 +81,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final PercentFreeTerminology FILL_FACTOR_LITERAL = new PercentFreeTerminology(FILL_FACTOR, "FILL_FACTOR"); //$NON-NLS-1$
+	public static final PercentFreeTerminology FILL_FACTOR_LITERAL = new PercentFreeTerminology(FILL_FACTOR, "FILL_FACTOR", "FILL_FACTOR"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>THRESHOLD</b></em>' literal object.
@@ -95,7 +95,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final PercentFreeTerminology THRESHOLD_LITERAL = new PercentFreeTerminology(THRESHOLD, "THRESHOLD"); //$NON-NLS-1$
+	public static final PercentFreeTerminology THRESHOLD_LITERAL = new PercentFreeTerminology(THRESHOLD, "THRESHOLD", "THRESHOLD"); //$NON-NLS-1$
 
 	/**
 	 * An array of all the '<em><b>Percent Free Terminology</b></em>' enumerators.
@@ -119,15 +119,15 @@
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Percent Free Terminology</b></em>' literal with the specified name.
+	 * Returns the '<em><b>Percent Free Terminology</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static PercentFreeTerminology get(String name) {
+	public static PercentFreeTerminology get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			PercentFreeTerminology result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -135,7 +135,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Percent Free Terminology</b></em>' literal with the specified value.
+	 * Returns the '<em><b>Percent Free Terminology</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static PercentFreeTerminology getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			PercentFreeTerminology result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Percent Free Terminology</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -155,8 +171,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private PercentFreeTerminology(int value, String name) {
-		super(value, name);
+	private PercentFreeTerminology(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //PercentFreeTerminology
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ProcedureType.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ProcedureType.java
index 64312c4..84f5844 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ProcedureType.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/ProcedureType.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProcedureType.java,v 1.1 2005/08/02 22:56:24 ledunnel Exp $
+ * $Id: ProcedureType.java,v 1.2 2005/12/22 23:32:55 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition;
 
@@ -56,7 +56,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ProcedureType PROCEDURE_LITERAL = new ProcedureType(PROCEDURE, "PROCEDURE"); //$NON-NLS-1$
+	public static final ProcedureType PROCEDURE_LITERAL = new ProcedureType(PROCEDURE, "PROCEDURE", "PROCEDURE"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>FUNCTION</b></em>' literal object.
@@ -70,7 +70,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final ProcedureType FUNCTION_LITERAL = new ProcedureType(FUNCTION, "FUNCTION"); //$NON-NLS-1$
+	public static final ProcedureType FUNCTION_LITERAL = new ProcedureType(FUNCTION, "FUNCTION", "FUNCTION"); //$NON-NLS-1$
 
 	/**
 	 * An array of all the '<em><b>Procedure Type</b></em>' enumerators.
@@ -93,15 +93,15 @@
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Procedure Type</b></em>' literal with the specified name.
+	 * Returns the '<em><b>Procedure Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static ProcedureType get(String name) {
+	public static ProcedureType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ProcedureType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -109,7 +109,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Procedure Type</b></em>' literal with the specified value.
+	 * Returns the '<em><b>Procedure Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ProcedureType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			ProcedureType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Procedure Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -128,8 +144,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private ProcedureType(int value, String name) {
-		super(value, name);
+	private ProcedureType(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //ProcedureType
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/QueryDefinition.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/QueryDefinition.java
index 3487326..54039e7 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/QueryDefinition.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/QueryDefinition.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: QueryDefinition.java,v 1.1 2005/08/02 22:56:24 ledunnel Exp $
+ * $Id: QueryDefinition.java,v 1.2 2005/12/22 23:32:55 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition;
 
@@ -30,10 +30,10 @@
  * @model
  * @generated
  */
-public interface QueryDefinition extends EObject{
+public interface QueryDefinition extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Identifier Quote String</b></em>' attribute.
-	 * The default value is <code>"\""</code>.
+	 * The default value is <code>"\\\""</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Identifier Quote String</em>' attribute isn't clear,
@@ -43,7 +43,7 @@
 	 * @return the value of the '<em>Identifier Quote String</em>' attribute.
 	 * @see #setIdentifierQuoteString(String)
 	 * @see org.eclipse.datatools.modelbase.dbdefinition.DatabaseDefinitionPackage#getQueryDefinition_IdentifierQuoteString()
-	 * @model default="\""
+	 * @model default="\\\""
 	 * @generated
 	 */
 	String getIdentifierQuoteString();
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/TableSpaceType.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/TableSpaceType.java
index f39e854..86973e5 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/TableSpaceType.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/TableSpaceType.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TableSpaceType.java,v 1.1 2005/08/02 22:56:24 ledunnel Exp $
+ * $Id: TableSpaceType.java,v 1.2 2005/12/22 23:32:55 bpayton Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition;
 
@@ -122,7 +122,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final TableSpaceType REGULAR_LITERAL = new TableSpaceType(REGULAR, "REGULAR"); //$NON-NLS-1$
+	public static final TableSpaceType REGULAR_LITERAL = new TableSpaceType(REGULAR, "REGULAR", "REGULAR"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>LOB</b></em>' literal object.
@@ -136,7 +136,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final TableSpaceType LOB_LITERAL = new TableSpaceType(LOB, "LOB"); //$NON-NLS-1$
+	public static final TableSpaceType LOB_LITERAL = new TableSpaceType(LOB, "LOB", "LOB"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>SYSTEM TEMPORARY</b></em>' literal object.
@@ -150,7 +150,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final TableSpaceType SYSTEM_TEMPORARY_LITERAL = new TableSpaceType(SYSTEM_TEMPORARY, "SYSTEM_TEMPORARY"); //$NON-NLS-1$
+	public static final TableSpaceType SYSTEM_TEMPORARY_LITERAL = new TableSpaceType(SYSTEM_TEMPORARY, "SYSTEM_TEMPORARY", "SYSTEM_TEMPORARY"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>USER TEMPORARY</b></em>' literal object.
@@ -164,7 +164,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final TableSpaceType USER_TEMPORARY_LITERAL = new TableSpaceType(USER_TEMPORARY, "USER_TEMPORARY"); //$NON-NLS-1$
+	public static final TableSpaceType USER_TEMPORARY_LITERAL = new TableSpaceType(USER_TEMPORARY, "USER_TEMPORARY", "USER_TEMPORARY"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>PERMANENT</b></em>' literal object.
@@ -178,7 +178,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final TableSpaceType PERMANENT_LITERAL = new TableSpaceType(PERMANENT, "PERMANENT"); //$NON-NLS-1$
+	public static final TableSpaceType PERMANENT_LITERAL = new TableSpaceType(PERMANENT, "PERMANENT", "PERMANENT"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>TEMPORARY</b></em>' literal object.
@@ -192,7 +192,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final TableSpaceType TEMPORARY_LITERAL = new TableSpaceType(TEMPORARY, "TEMPORARY"); //$NON-NLS-1$
+	public static final TableSpaceType TEMPORARY_LITERAL = new TableSpaceType(TEMPORARY, "TEMPORARY", "TEMPORARY"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>LONG</b></em>' literal object.
@@ -206,7 +206,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final TableSpaceType LONG_LITERAL = new TableSpaceType(LONG, "LONG"); //$NON-NLS-1$
+	public static final TableSpaceType LONG_LITERAL = new TableSpaceType(LONG, "LONG", "LONG"); //$NON-NLS-1$
 
 	/**
 	 * The '<em><b>LARGE</b></em>' literal object.
@@ -220,7 +220,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	public static final TableSpaceType LARGE_LITERAL = new TableSpaceType(LARGE, "LARGE"); //$NON-NLS-1$
+	public static final TableSpaceType LARGE_LITERAL = new TableSpaceType(LARGE, "LARGE", "LARGE"); //$NON-NLS-1$
 
 	/**
 	 * An array of all the '<em><b>Table Space Type</b></em>' enumerators.
@@ -249,15 +249,15 @@
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Table Space Type</b></em>' literal with the specified name.
+	 * Returns the '<em><b>Table Space Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static TableSpaceType get(String name) {
+	public static TableSpaceType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			TableSpaceType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -265,7 +265,23 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Table Space Type</b></em>' literal with the specified value.
+	 * Returns the '<em><b>Table Space Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static TableSpaceType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			TableSpaceType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Table Space Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -290,8 +306,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private TableSpaceType(int value, String name) {
-		super(value, name);
+	private TableSpaceType(int value, String name, String literal) {
+		super(value, name, literal);
 	}
 
 } //TableSpaceType
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ColumnDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ColumnDefinitionImpl.java
index ae0063f..19a0024 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ColumnDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ColumnDefinitionImpl.java
@@ -233,7 +233,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getColumnDefinition();
+		return DatabaseDefinitionPackage.Literals.COLUMN_DEFINITION;
 	}
 
 	/**
@@ -421,8 +421,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.COLUMN_DEFINITION__IDENTITY_COLUMN_DATA_TYPE_DEFINITIONS:
 				return getIdentityColumnDataTypeDefinitions();
 			case DatabaseDefinitionPackage.COLUMN_DEFINITION__IDENTITY_SUPPORTED:
@@ -442,7 +442,7 @@
 			case DatabaseDefinitionPackage.COLUMN_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return new Integer(getMaximumIdentifierLength());
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -450,8 +450,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.COLUMN_DEFINITION__IDENTITY_COLUMN_DATA_TYPE_DEFINITIONS:
 				getIdentityColumnDataTypeDefinitions().clear();
 				getIdentityColumnDataTypeDefinitions().addAll((Collection)newValue);
@@ -481,7 +481,7 @@
 				setMaximumIdentifierLength(((Integer)newValue).intValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -489,8 +489,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.COLUMN_DEFINITION__IDENTITY_COLUMN_DATA_TYPE_DEFINITIONS:
 				getIdentityColumnDataTypeDefinitions().clear();
 				return;
@@ -519,7 +519,7 @@
 				setMaximumIdentifierLength(MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -527,8 +527,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.COLUMN_DEFINITION__IDENTITY_COLUMN_DATA_TYPE_DEFINITIONS:
 				return identityColumnDataTypeDefinitions != null && !identityColumnDataTypeDefinitions.isEmpty();
 			case DatabaseDefinitionPackage.COLUMN_DEFINITION__IDENTITY_SUPPORTED:
@@ -548,7 +548,7 @@
 			case DatabaseDefinitionPackage.COLUMN_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return maximumIdentifierLength != MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ConstraintDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ConstraintDefinitionImpl.java
index f123746..b364911 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ConstraintDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ConstraintDefinitionImpl.java
@@ -296,7 +296,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getConstraintDefinition();
+		return DatabaseDefinitionPackage.Literals.CONSTRAINT_DEFINITION;
 	}
 
 	/**
@@ -550,8 +550,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.CONSTRAINT_DEFINITION__DEFERRABLE_CONSTRAINT_SUPPORTED:
 				return isDeferrableConstraintSupported() ? Boolean.TRUE : Boolean.FALSE;
 			case DatabaseDefinitionPackage.CONSTRAINT_DEFINITION__INFORMATIONAL_CONSTRAINT_SUPPORTED:
@@ -579,7 +579,7 @@
 			case DatabaseDefinitionPackage.CONSTRAINT_DEFINITION__MAXIMUM_CHECK_CONSTRAINT_IDENTIFIER_LENGTH:
 				return new Integer(getMaximumCheckConstraintIdentifierLength());
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -587,8 +587,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.CONSTRAINT_DEFINITION__DEFERRABLE_CONSTRAINT_SUPPORTED:
 				setDeferrableConstraintSupported(((Boolean)newValue).booleanValue());
 				return;
@@ -632,7 +632,7 @@
 				setMaximumCheckConstraintIdentifierLength(((Integer)newValue).intValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -640,8 +640,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.CONSTRAINT_DEFINITION__DEFERRABLE_CONSTRAINT_SUPPORTED:
 				setDeferrableConstraintSupported(DEFERRABLE_CONSTRAINT_SUPPORTED_EDEFAULT);
 				return;
@@ -682,7 +682,7 @@
 				setMaximumCheckConstraintIdentifierLength(MAXIMUM_CHECK_CONSTRAINT_IDENTIFIER_LENGTH_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -690,8 +690,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.CONSTRAINT_DEFINITION__DEFERRABLE_CONSTRAINT_SUPPORTED:
 				return deferrableConstraintSupported != DEFERRABLE_CONSTRAINT_SUPPORTED_EDEFAULT;
 			case DatabaseDefinitionPackage.CONSTRAINT_DEFINITION__INFORMATIONAL_CONSTRAINT_SUPPORTED:
@@ -719,7 +719,7 @@
 			case DatabaseDefinitionPackage.CONSTRAINT_DEFINITION__MAXIMUM_CHECK_CONSTRAINT_IDENTIFIER_LENGTH:
 				return maximumCheckConstraintIdentifierLength != MAXIMUM_CHECK_CONSTRAINT_IDENTIFIER_LENGTH_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DatabaseDefinitionFactoryImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DatabaseDefinitionFactoryImpl.java
index 80065ce..0cb9f44 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DatabaseDefinitionFactoryImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DatabaseDefinitionFactoryImpl.java
@@ -14,10 +14,14 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 
 
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
@@ -26,6 +30,25 @@
  */
 public class DatabaseDefinitionFactoryImpl extends EFactoryImpl implements DatabaseDefinitionFactory {
 	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static DatabaseDefinitionFactory init() {
+		try {
+			DatabaseDefinitionFactory theDatabaseDefinitionFactory = (DatabaseDefinitionFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/datatools/modelbase/dbdefinition/dbdefinition.ecore"); //$NON-NLS-1$ 
+			if (theDatabaseDefinitionFactory != null) {
+				return theDatabaseDefinitionFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new DatabaseDefinitionFactoryImpl();
+	}
+
+	/**
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -73,51 +96,24 @@
 	 */
 	public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-			case DatabaseDefinitionPackage.CHECK_OPTION: {
-				CheckOption result = CheckOption.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				return result;
-			}
-			case DatabaseDefinitionPackage.LANGUAGE_TYPE: {
-				LanguageType result = LanguageType.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				return result;
-			}
-			case DatabaseDefinitionPackage.PARAMETER_STYLE: {
-				ParameterStyle result = ParameterStyle.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				return result;
-			}
-			case DatabaseDefinitionPackage.PARENT_DELETE_DRI_RULE_TYPE: {
-				ParentDeleteDRIRuleType result = ParentDeleteDRIRuleType.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				return result;
-			}
-			case DatabaseDefinitionPackage.PARENT_UPDATE_DRI_RULE_TYPE: {
-				ParentUpdateDRIRuleType result = ParentUpdateDRIRuleType.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				return result;
-			}
-			case DatabaseDefinitionPackage.PROCEDURE_TYPE: {
-				ProcedureType result = ProcedureType.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				return result;
-			}
-			case DatabaseDefinitionPackage.TABLE_SPACE_TYPE: {
-				TableSpaceType result = TableSpaceType.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				return result;
-			}
-			case DatabaseDefinitionPackage.PERCENT_FREE_TERMINOLOGY: {
-				PercentFreeTerminology result = PercentFreeTerminology.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				return result;
-			}
-			case DatabaseDefinitionPackage.LENGTH_UNIT: {
-				LengthUnit result = LengthUnit.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				return result;
-			}
+			case DatabaseDefinitionPackage.CHECK_OPTION:
+				return createCheckOptionFromString(eDataType, initialValue);
+			case DatabaseDefinitionPackage.LANGUAGE_TYPE:
+				return createLanguageTypeFromString(eDataType, initialValue);
+			case DatabaseDefinitionPackage.PARAMETER_STYLE:
+				return createParameterStyleFromString(eDataType, initialValue);
+			case DatabaseDefinitionPackage.PARENT_DELETE_DRI_RULE_TYPE:
+				return createParentDeleteDRIRuleTypeFromString(eDataType, initialValue);
+			case DatabaseDefinitionPackage.PARENT_UPDATE_DRI_RULE_TYPE:
+				return createParentUpdateDRIRuleTypeFromString(eDataType, initialValue);
+			case DatabaseDefinitionPackage.PROCEDURE_TYPE:
+				return createProcedureTypeFromString(eDataType, initialValue);
+			case DatabaseDefinitionPackage.TABLE_SPACE_TYPE:
+				return createTableSpaceTypeFromString(eDataType, initialValue);
+			case DatabaseDefinitionPackage.PERCENT_FREE_TERMINOLOGY:
+				return createPercentFreeTerminologyFromString(eDataType, initialValue);
+			case DatabaseDefinitionPackage.LENGTH_UNIT:
+				return createLengthUnitFromString(eDataType, initialValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
@@ -131,23 +127,23 @@
 	public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
 			case DatabaseDefinitionPackage.CHECK_OPTION:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertCheckOptionToString(eDataType, instanceValue);
 			case DatabaseDefinitionPackage.LANGUAGE_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertLanguageTypeToString(eDataType, instanceValue);
 			case DatabaseDefinitionPackage.PARAMETER_STYLE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertParameterStyleToString(eDataType, instanceValue);
 			case DatabaseDefinitionPackage.PARENT_DELETE_DRI_RULE_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertParentDeleteDRIRuleTypeToString(eDataType, instanceValue);
 			case DatabaseDefinitionPackage.PARENT_UPDATE_DRI_RULE_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertParentUpdateDRIRuleTypeToString(eDataType, instanceValue);
 			case DatabaseDefinitionPackage.PROCEDURE_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertProcedureTypeToString(eDataType, instanceValue);
 			case DatabaseDefinitionPackage.TABLE_SPACE_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertTableSpaceTypeToString(eDataType, instanceValue);
 			case DatabaseDefinitionPackage.PERCENT_FREE_TERMINOLOGY:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertPercentFreeTerminologyToString(eDataType, instanceValue);
 			case DatabaseDefinitionPackage.LENGTH_UNIT:
-				return instanceValue == null ? null : instanceValue.toString();
+				return convertLengthUnitToString(eDataType, instanceValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
@@ -348,6 +344,186 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public CheckOption createCheckOptionFromString(EDataType eDataType, String initialValue) {
+		CheckOption result = CheckOption.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertCheckOptionToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public LanguageType createLanguageTypeFromString(EDataType eDataType, String initialValue) {
+		LanguageType result = LanguageType.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertLanguageTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ParameterStyle createParameterStyleFromString(EDataType eDataType, String initialValue) {
+		ParameterStyle result = ParameterStyle.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertParameterStyleToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ParentDeleteDRIRuleType createParentDeleteDRIRuleTypeFromString(EDataType eDataType, String initialValue) {
+		ParentDeleteDRIRuleType result = ParentDeleteDRIRuleType.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertParentDeleteDRIRuleTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ParentUpdateDRIRuleType createParentUpdateDRIRuleTypeFromString(EDataType eDataType, String initialValue) {
+		ParentUpdateDRIRuleType result = ParentUpdateDRIRuleType.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertParentUpdateDRIRuleTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ProcedureType createProcedureTypeFromString(EDataType eDataType, String initialValue) {
+		ProcedureType result = ProcedureType.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertProcedureTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TableSpaceType createTableSpaceTypeFromString(EDataType eDataType, String initialValue) {
+		TableSpaceType result = TableSpaceType.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertTableSpaceTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PercentFreeTerminology createPercentFreeTerminologyFromString(EDataType eDataType, String initialValue) {
+		PercentFreeTerminology result = PercentFreeTerminology.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertPercentFreeTerminologyToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public LengthUnit createLengthUnitFromString(EDataType eDataType, String initialValue) {
+		LengthUnit result = LengthUnit.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertLengthUnitToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public DatabaseDefinitionPackage getDatabaseDefinitionPackage() {
 		return (DatabaseDefinitionPackage)getEPackage();
 	}
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DatabaseDefinitionPackageImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DatabaseDefinitionPackageImpl.java
index 4e0a729..b8f8681 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DatabaseDefinitionPackageImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DatabaseDefinitionPackageImpl.java
@@ -42,9 +42,23 @@
 import org.eclipse.datatools.modelbase.dbdefinition.UserDefinedTypeDefinition;
 import org.eclipse.datatools.modelbase.dbdefinition.ViewDefinition;
 
+import org.eclipse.datatools.modelbase.sql.accesscontrol.SQLAccessControlPackage;
+
+import org.eclipse.datatools.modelbase.sql.constraints.SQLConstraintsPackage;
+
 import org.eclipse.datatools.modelbase.sql.accesscontrol.impl.SQLAccessControlPackageImpl;
 import org.eclipse.datatools.modelbase.sql.constraints.impl.SQLConstraintsPackageImpl;
 import org.eclipse.datatools.modelbase.sql.datatypes.SQLDataTypesPackage;
+import org.eclipse.datatools.modelbase.sql.expressions.SQLExpressionsPackage;
+
+import org.eclipse.datatools.modelbase.sql.routines.SQLRoutinesPackage;
+
+import org.eclipse.datatools.modelbase.sql.schema.SQLSchemaPackage;
+
+import org.eclipse.datatools.modelbase.sql.statements.SQLStatementsPackage;
+
+import org.eclipse.datatools.modelbase.sql.tables.SQLTablesPackage;
+
 import org.eclipse.datatools.modelbase.sql.datatypes.impl.SQLDataTypesPackageImpl;
 import org.eclipse.datatools.modelbase.sql.expressions.impl.SQLExpressionsPackageImpl;
 import org.eclipse.datatools.modelbase.sql.routines.impl.SQLRoutinesPackageImpl;
@@ -56,6 +70,8 @@
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.impl.EcorePackageImpl;
 
@@ -319,15 +335,15 @@
 		isInited = true;
 
 		// Initialize simple dependencies
-		SQLSchemaPackageImpl.init();
-		SQLConstraintsPackageImpl.init();
-		SQLDataTypesPackageImpl.init();
-		SQLExpressionsPackageImpl.init();
-		SQLRoutinesPackageImpl.init();
-		SQLStatementsPackageImpl.init();
-		SQLTablesPackageImpl.init();
-		SQLAccessControlPackageImpl.init();
-		EcorePackageImpl.init();
+		SQLSchemaPackage.eINSTANCE.eClass();
+		SQLConstraintsPackage.eINSTANCE.eClass();
+		SQLDataTypesPackage.eINSTANCE.eClass();
+		SQLExpressionsPackage.eINSTANCE.eClass();
+		SQLRoutinesPackage.eINSTANCE.eClass();
+		SQLStatementsPackage.eINSTANCE.eClass();
+		SQLTablesPackage.eINSTANCE.eClass();
+		SQLAccessControlPackage.eINSTANCE.eClass();
+		EcorePackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theDatabaseDefinitionPackage.createPackageContents();
@@ -2665,7 +2681,7 @@
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		SQLDataTypesPackageImpl theSQLDataTypesPackage = (SQLDataTypesPackageImpl)EPackage.Registry.INSTANCE.getEPackage(SQLDataTypesPackage.eNS_URI);
+		SQLDataTypesPackage theSQLDataTypesPackage = (SQLDataTypesPackage)EPackage.Registry.INSTANCE.getEPackage(SQLDataTypesPackage.eNS_URI);
 
 		// Add supertypes to classes
 
@@ -2868,7 +2884,7 @@
 		initEAttribute(getUserDefinedTypeDefinition_MaximumIdentifierLength(), ecorePackage.getEInt(), "maximumIdentifierLength", null, 0, 1, UserDefinedTypeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(queryDefinitionEClass, QueryDefinition.class, "QueryDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getQueryDefinition_IdentifierQuoteString(), ecorePackage.getEString(), "identifierQuoteString", "\"", 0, 1, QueryDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		initEAttribute(getQueryDefinition_IdentifierQuoteString(), ecorePackage.getEString(), "identifierQuoteString", "\\\"", 0, 1, QueryDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		initEAttribute(getQueryDefinition_HostVariableMarker(), ecorePackage.getEString(), "hostVariableMarker", ":", 0, 1, QueryDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
 		initEAttribute(getQueryDefinition_HostVariableMarkerSupported(), ecorePackage.getEBoolean(), "hostVariableMarkerSupported", "false", 0, 1, QueryDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
 		initEAttribute(getQueryDefinition_CastExpressionSupported(), ecorePackage.getEBoolean(), "castExpressionSupported", "false", 0, 1, QueryDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DatabaseVendorDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DatabaseVendorDefinitionImpl.java
index af384f1..323e8c2 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DatabaseVendorDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DatabaseVendorDefinitionImpl.java
@@ -804,7 +804,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getDatabaseVendorDefinition();
+		return DatabaseDefinitionPackage.Literals.DATABASE_VENDOR_DEFINITION;
 	}
 
 	/**
@@ -1358,6 +1358,527 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
+				return ((InternalEList)getPredefinedDataTypeDefinitions()).basicRemove(otherEnd, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_SPACE_DEFINITION:
+				return basicSetTableSpaceDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_DEFINITION:
+				return basicSetStoredProcedureDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_DEFINITION:
+				return basicSetTriggerDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__COLUMN_DEFINITION:
+				return basicSetColumnDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINT_DEFINITION:
+				return basicSetConstraintDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EXTENDED_DEFINITIONS:
+				return ((InternalEList)getExtendedDefinitions()).basicRemove(otherEnd, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__INDEX_DEFINITION:
+				return basicSetIndexDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_DEFINITION:
+				return basicSetTableDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_DEFINITION:
+				return basicSetSequenceDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__UDT_DEFINITION:
+				return basicSetUdtDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUERY_DEFINITION:
+				return basicSetQueryDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_SYNTAX_DEFINITION:
+				return basicSetSQLSyntaxDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_DEFINITION:
+				return basicSetNicknameDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_DEFINITION:
+				return basicSetSchemaDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_DEFINITION:
+				return basicSetViewDefinition(null, msgs);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DEBUGGER_DEFINITION:
+				return basicSetDebuggerDefinition(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
+				return getPredefinedDataTypeDefinitions();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_SPACE_DEFINITION:
+				return getTableSpaceDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_DEFINITION:
+				return getStoredProcedureDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_DEFINITION:
+				return getTriggerDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__COLUMN_DEFINITION:
+				return getColumnDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINT_DEFINITION:
+				return getConstraintDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EXTENDED_DEFINITIONS:
+				return getExtendedDefinitions();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__INDEX_DEFINITION:
+				return getIndexDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_DEFINITION:
+				return getTableDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_DEFINITION:
+				return getSequenceDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__UDT_DEFINITION:
+				return getUdtDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUERY_DEFINITION:
+				return getQueryDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_SYNTAX_DEFINITION:
+				return getSQLSyntaxDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_DEFINITION:
+				return getNicknameDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_DEFINITION:
+				return getSchemaDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_DEFINITION:
+				return getViewDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DEBUGGER_DEFINITION:
+				return getDebuggerDefinition();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VENDOR:
+				return getVendor();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VERSION:
+				return getVersion();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINTS_SUPPORTED:
+				return isConstraintsSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
+				return new Integer(getMaximumIdentifierLength());
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_SUPPORTED:
+				return isTriggerSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SNAPSHOT_VIEW_SUPPORTED:
+				return isSnapshotViewSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__JOIN_SUPPORTED:
+				return isJoinSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_TRIGGER_SUPPORTED:
+				return isViewTriggerSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLESPACES_SUPPORTED:
+				return isTablespacesSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_COMMENT_LENGTH:
+				return new Integer(getMaximumCommentLength());
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_SUPPORTED:
+				return isSequenceSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_SUPPORTED:
+				return isMQTSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_SUPPORTED:
+				return isSchemaSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__ALIAS_SUPPORTED:
+				return isAliasSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SYNONYM_SUPPORTED:
+				return isSynonymSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__USER_DEFINED_TYPE_SUPPORTED:
+				return isUserDefinedTypeSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DOMAIN_SUPPORTED:
+				return isDomainSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_STATEMENT_SUPPORTED:
+				return isSQLStatementSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_SUPPORTED:
+				return isNicknameSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DML_SUPPORTED:
+				return isQuotedDMLSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DDL_SUPPORTED:
+				return isQuotedDDLSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__XML_SUPPORTED:
+				return isXmlSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_INDEX_SUPPORTED:
+				return isMQTIndexSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EVENT_SUPPORTED:
+				return isEventSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_UDF_SUPPORTED:
+				return isSqlUDFSupported() ? Boolean.TRUE : Boolean.FALSE;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_SUPPORTED:
+				return isStoredProcedureSupported() ? Boolean.TRUE : Boolean.FALSE;
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
+				getPredefinedDataTypeDefinitions().clear();
+				getPredefinedDataTypeDefinitions().addAll((Collection)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_SPACE_DEFINITION:
+				setTableSpaceDefinition((TableSpaceDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_DEFINITION:
+				setStoredProcedureDefinition((StoredProcedureDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_DEFINITION:
+				setTriggerDefinition((TriggerDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__COLUMN_DEFINITION:
+				setColumnDefinition((ColumnDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINT_DEFINITION:
+				setConstraintDefinition((ConstraintDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EXTENDED_DEFINITIONS:
+				getExtendedDefinitions().clear();
+				getExtendedDefinitions().addAll((Collection)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__INDEX_DEFINITION:
+				setIndexDefinition((IndexDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_DEFINITION:
+				setTableDefinition((TableDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_DEFINITION:
+				setSequenceDefinition((SequenceDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__UDT_DEFINITION:
+				setUdtDefinition((UserDefinedTypeDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUERY_DEFINITION:
+				setQueryDefinition((QueryDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_SYNTAX_DEFINITION:
+				setSQLSyntaxDefinition((SQLSyntaxDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_DEFINITION:
+				setNicknameDefinition((NicknameDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_DEFINITION:
+				setSchemaDefinition((SchemaDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_DEFINITION:
+				setViewDefinition((ViewDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DEBUGGER_DEFINITION:
+				setDebuggerDefinition((DebuggerDefinition)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VENDOR:
+				setVendor((String)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VERSION:
+				setVersion((String)newValue);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINTS_SUPPORTED:
+				setConstraintsSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
+				setMaximumIdentifierLength(((Integer)newValue).intValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_SUPPORTED:
+				setTriggerSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SNAPSHOT_VIEW_SUPPORTED:
+				setSnapshotViewSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__JOIN_SUPPORTED:
+				setJoinSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_TRIGGER_SUPPORTED:
+				setViewTriggerSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLESPACES_SUPPORTED:
+				setTablespacesSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_COMMENT_LENGTH:
+				setMaximumCommentLength(((Integer)newValue).intValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_SUPPORTED:
+				setSequenceSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_SUPPORTED:
+				setMQTSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_SUPPORTED:
+				setSchemaSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__ALIAS_SUPPORTED:
+				setAliasSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SYNONYM_SUPPORTED:
+				setSynonymSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__USER_DEFINED_TYPE_SUPPORTED:
+				setUserDefinedTypeSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DOMAIN_SUPPORTED:
+				setDomainSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_STATEMENT_SUPPORTED:
+				setSQLStatementSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_SUPPORTED:
+				setNicknameSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DML_SUPPORTED:
+				setQuotedDMLSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DDL_SUPPORTED:
+				setQuotedDDLSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__XML_SUPPORTED:
+				setXmlSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_INDEX_SUPPORTED:
+				setMQTIndexSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EVENT_SUPPORTED:
+				setEventSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_UDF_SUPPORTED:
+				setSqlUDFSupported(((Boolean)newValue).booleanValue());
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_SUPPORTED:
+				setStoredProcedureSupported(((Boolean)newValue).booleanValue());
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
+				getPredefinedDataTypeDefinitions().clear();
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_SPACE_DEFINITION:
+				setTableSpaceDefinition((TableSpaceDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_DEFINITION:
+				setStoredProcedureDefinition((StoredProcedureDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_DEFINITION:
+				setTriggerDefinition((TriggerDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__COLUMN_DEFINITION:
+				setColumnDefinition((ColumnDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINT_DEFINITION:
+				setConstraintDefinition((ConstraintDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EXTENDED_DEFINITIONS:
+				getExtendedDefinitions().clear();
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__INDEX_DEFINITION:
+				setIndexDefinition((IndexDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_DEFINITION:
+				setTableDefinition((TableDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_DEFINITION:
+				setSequenceDefinition((SequenceDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__UDT_DEFINITION:
+				setUdtDefinition((UserDefinedTypeDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUERY_DEFINITION:
+				setQueryDefinition((QueryDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_SYNTAX_DEFINITION:
+				setSQLSyntaxDefinition((SQLSyntaxDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_DEFINITION:
+				setNicknameDefinition((NicknameDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_DEFINITION:
+				setSchemaDefinition((SchemaDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_DEFINITION:
+				setViewDefinition((ViewDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DEBUGGER_DEFINITION:
+				setDebuggerDefinition((DebuggerDefinition)null);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VENDOR:
+				setVendor(VENDOR_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VERSION:
+				setVersion(VERSION_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINTS_SUPPORTED:
+				setConstraintsSupported(CONSTRAINTS_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
+				setMaximumIdentifierLength(MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_SUPPORTED:
+				setTriggerSupported(TRIGGER_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SNAPSHOT_VIEW_SUPPORTED:
+				setSnapshotViewSupported(SNAPSHOT_VIEW_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__JOIN_SUPPORTED:
+				setJoinSupported(JOIN_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_TRIGGER_SUPPORTED:
+				setViewTriggerSupported(VIEW_TRIGGER_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLESPACES_SUPPORTED:
+				setTablespacesSupported(TABLESPACES_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_COMMENT_LENGTH:
+				setMaximumCommentLength(MAXIMUM_COMMENT_LENGTH_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_SUPPORTED:
+				setSequenceSupported(SEQUENCE_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_SUPPORTED:
+				setMQTSupported(MQT_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_SUPPORTED:
+				setSchemaSupported(SCHEMA_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__ALIAS_SUPPORTED:
+				setAliasSupported(ALIAS_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SYNONYM_SUPPORTED:
+				setSynonymSupported(SYNONYM_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__USER_DEFINED_TYPE_SUPPORTED:
+				setUserDefinedTypeSupported(USER_DEFINED_TYPE_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DOMAIN_SUPPORTED:
+				setDomainSupported(DOMAIN_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_STATEMENT_SUPPORTED:
+				setSQLStatementSupported(SQL_STATEMENT_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_SUPPORTED:
+				setNicknameSupported(NICKNAME_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DML_SUPPORTED:
+				setQuotedDMLSupported(QUOTED_DML_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DDL_SUPPORTED:
+				setQuotedDDLSupported(QUOTED_DDL_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__XML_SUPPORTED:
+				setXmlSupported(XML_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_INDEX_SUPPORTED:
+				setMQTIndexSupported(MQT_INDEX_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EVENT_SUPPORTED:
+				setEventSupported(EVENT_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_UDF_SUPPORTED:
+				setSqlUDFSupported(SQL_UDF_SUPPORTED_EDEFAULT);
+				return;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_SUPPORTED:
+				setStoredProcedureSupported(STORED_PROCEDURE_SUPPORTED_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
+				return predefinedDataTypeDefinitions != null && !predefinedDataTypeDefinitions.isEmpty();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_SPACE_DEFINITION:
+				return tableSpaceDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_DEFINITION:
+				return storedProcedureDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_DEFINITION:
+				return triggerDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__COLUMN_DEFINITION:
+				return columnDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINT_DEFINITION:
+				return constraintDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EXTENDED_DEFINITIONS:
+				return extendedDefinitions != null && !extendedDefinitions.isEmpty();
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__INDEX_DEFINITION:
+				return indexDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_DEFINITION:
+				return tableDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_DEFINITION:
+				return sequenceDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__UDT_DEFINITION:
+				return udtDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUERY_DEFINITION:
+				return queryDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_SYNTAX_DEFINITION:
+				return sqlSyntaxDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_DEFINITION:
+				return nicknameDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_DEFINITION:
+				return schemaDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_DEFINITION:
+				return viewDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DEBUGGER_DEFINITION:
+				return debuggerDefinition != null;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VENDOR:
+				return VENDOR_EDEFAULT == null ? vendor != null : !VENDOR_EDEFAULT.equals(vendor);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VERSION:
+				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINTS_SUPPORTED:
+				return constraintsSupported != CONSTRAINTS_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
+				return maximumIdentifierLength != MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_SUPPORTED:
+				return triggerSupported != TRIGGER_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SNAPSHOT_VIEW_SUPPORTED:
+				return snapshotViewSupported != SNAPSHOT_VIEW_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__JOIN_SUPPORTED:
+				return joinSupported != JOIN_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_TRIGGER_SUPPORTED:
+				return viewTriggerSupported != VIEW_TRIGGER_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLESPACES_SUPPORTED:
+				return tablespacesSupported != TABLESPACES_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_COMMENT_LENGTH:
+				return maximumCommentLength != MAXIMUM_COMMENT_LENGTH_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_SUPPORTED:
+				return sequenceSupported != SEQUENCE_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_SUPPORTED:
+				return mQTSupported != MQT_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_SUPPORTED:
+				return schemaSupported != SCHEMA_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__ALIAS_SUPPORTED:
+				return aliasSupported != ALIAS_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SYNONYM_SUPPORTED:
+				return synonymSupported != SYNONYM_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__USER_DEFINED_TYPE_SUPPORTED:
+				return userDefinedTypeSupported != USER_DEFINED_TYPE_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DOMAIN_SUPPORTED:
+				return domainSupported != DOMAIN_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_STATEMENT_SUPPORTED:
+				return sqlStatementSupported != SQL_STATEMENT_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_SUPPORTED:
+				return nicknameSupported != NICKNAME_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DML_SUPPORTED:
+				return quotedDMLSupported != QUOTED_DML_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DDL_SUPPORTED:
+				return quotedDDLSupported != QUOTED_DDL_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__XML_SUPPORTED:
+				return xmlSupported != XML_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_INDEX_SUPPORTED:
+				return mQTIndexSupported != MQT_INDEX_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EVENT_SUPPORTED:
+				return eventSupported != EVENT_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_UDF_SUPPORTED:
+				return sqlUDFSupported != SQL_UDF_SUPPORTED_EDEFAULT;
+			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_SUPPORTED:
+				return storedProcedureSupported != STORED_PROCEDURE_SUPPORTED_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EList getPredefinedDataTypeDefinitions() {
 		if (predefinedDataTypeDefinitions == null) {
 			predefinedDataTypeDefinitions = new EObjectContainmentEList(PredefinedDataTypeDefinition.class, this, DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS);
@@ -2027,531 +2548,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
-					return ((InternalEList)getPredefinedDataTypeDefinitions()).basicRemove(otherEnd, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_SPACE_DEFINITION:
-					return basicSetTableSpaceDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_DEFINITION:
-					return basicSetStoredProcedureDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_DEFINITION:
-					return basicSetTriggerDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__COLUMN_DEFINITION:
-					return basicSetColumnDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINT_DEFINITION:
-					return basicSetConstraintDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EXTENDED_DEFINITIONS:
-					return ((InternalEList)getExtendedDefinitions()).basicRemove(otherEnd, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__INDEX_DEFINITION:
-					return basicSetIndexDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_DEFINITION:
-					return basicSetTableDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_DEFINITION:
-					return basicSetSequenceDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__UDT_DEFINITION:
-					return basicSetUdtDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUERY_DEFINITION:
-					return basicSetQueryDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_SYNTAX_DEFINITION:
-					return basicSetSQLSyntaxDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_DEFINITION:
-					return basicSetNicknameDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_DEFINITION:
-					return basicSetSchemaDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_DEFINITION:
-					return basicSetViewDefinition(null, msgs);
-				case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DEBUGGER_DEFINITION:
-					return basicSetDebuggerDefinition(null, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
-				return getPredefinedDataTypeDefinitions();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_SPACE_DEFINITION:
-				return getTableSpaceDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_DEFINITION:
-				return getStoredProcedureDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_DEFINITION:
-				return getTriggerDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__COLUMN_DEFINITION:
-				return getColumnDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINT_DEFINITION:
-				return getConstraintDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EXTENDED_DEFINITIONS:
-				return getExtendedDefinitions();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__INDEX_DEFINITION:
-				return getIndexDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_DEFINITION:
-				return getTableDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_DEFINITION:
-				return getSequenceDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__UDT_DEFINITION:
-				return getUdtDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUERY_DEFINITION:
-				return getQueryDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_SYNTAX_DEFINITION:
-				return getSQLSyntaxDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_DEFINITION:
-				return getNicknameDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_DEFINITION:
-				return getSchemaDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_DEFINITION:
-				return getViewDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DEBUGGER_DEFINITION:
-				return getDebuggerDefinition();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VENDOR:
-				return getVendor();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VERSION:
-				return getVersion();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINTS_SUPPORTED:
-				return isConstraintsSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
-				return new Integer(getMaximumIdentifierLength());
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_SUPPORTED:
-				return isTriggerSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SNAPSHOT_VIEW_SUPPORTED:
-				return isSnapshotViewSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__JOIN_SUPPORTED:
-				return isJoinSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_TRIGGER_SUPPORTED:
-				return isViewTriggerSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLESPACES_SUPPORTED:
-				return isTablespacesSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_COMMENT_LENGTH:
-				return new Integer(getMaximumCommentLength());
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_SUPPORTED:
-				return isSequenceSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_SUPPORTED:
-				return isMQTSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_SUPPORTED:
-				return isSchemaSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__ALIAS_SUPPORTED:
-				return isAliasSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SYNONYM_SUPPORTED:
-				return isSynonymSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__USER_DEFINED_TYPE_SUPPORTED:
-				return isUserDefinedTypeSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DOMAIN_SUPPORTED:
-				return isDomainSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_STATEMENT_SUPPORTED:
-				return isSQLStatementSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_SUPPORTED:
-				return isNicknameSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DML_SUPPORTED:
-				return isQuotedDMLSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DDL_SUPPORTED:
-				return isQuotedDDLSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__XML_SUPPORTED:
-				return isXmlSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_INDEX_SUPPORTED:
-				return isMQTIndexSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EVENT_SUPPORTED:
-				return isEventSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_UDF_SUPPORTED:
-				return isSqlUDFSupported() ? Boolean.TRUE : Boolean.FALSE;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_SUPPORTED:
-				return isStoredProcedureSupported() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
-				getPredefinedDataTypeDefinitions().clear();
-				getPredefinedDataTypeDefinitions().addAll((Collection)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_SPACE_DEFINITION:
-				setTableSpaceDefinition((TableSpaceDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_DEFINITION:
-				setStoredProcedureDefinition((StoredProcedureDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_DEFINITION:
-				setTriggerDefinition((TriggerDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__COLUMN_DEFINITION:
-				setColumnDefinition((ColumnDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINT_DEFINITION:
-				setConstraintDefinition((ConstraintDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EXTENDED_DEFINITIONS:
-				getExtendedDefinitions().clear();
-				getExtendedDefinitions().addAll((Collection)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__INDEX_DEFINITION:
-				setIndexDefinition((IndexDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_DEFINITION:
-				setTableDefinition((TableDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_DEFINITION:
-				setSequenceDefinition((SequenceDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__UDT_DEFINITION:
-				setUdtDefinition((UserDefinedTypeDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUERY_DEFINITION:
-				setQueryDefinition((QueryDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_SYNTAX_DEFINITION:
-				setSQLSyntaxDefinition((SQLSyntaxDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_DEFINITION:
-				setNicknameDefinition((NicknameDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_DEFINITION:
-				setSchemaDefinition((SchemaDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_DEFINITION:
-				setViewDefinition((ViewDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DEBUGGER_DEFINITION:
-				setDebuggerDefinition((DebuggerDefinition)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VENDOR:
-				setVendor((String)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VERSION:
-				setVersion((String)newValue);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINTS_SUPPORTED:
-				setConstraintsSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
-				setMaximumIdentifierLength(((Integer)newValue).intValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_SUPPORTED:
-				setTriggerSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SNAPSHOT_VIEW_SUPPORTED:
-				setSnapshotViewSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__JOIN_SUPPORTED:
-				setJoinSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_TRIGGER_SUPPORTED:
-				setViewTriggerSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLESPACES_SUPPORTED:
-				setTablespacesSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_COMMENT_LENGTH:
-				setMaximumCommentLength(((Integer)newValue).intValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_SUPPORTED:
-				setSequenceSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_SUPPORTED:
-				setMQTSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_SUPPORTED:
-				setSchemaSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__ALIAS_SUPPORTED:
-				setAliasSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SYNONYM_SUPPORTED:
-				setSynonymSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__USER_DEFINED_TYPE_SUPPORTED:
-				setUserDefinedTypeSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DOMAIN_SUPPORTED:
-				setDomainSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_STATEMENT_SUPPORTED:
-				setSQLStatementSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_SUPPORTED:
-				setNicknameSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DML_SUPPORTED:
-				setQuotedDMLSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DDL_SUPPORTED:
-				setQuotedDDLSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__XML_SUPPORTED:
-				setXmlSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_INDEX_SUPPORTED:
-				setMQTIndexSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EVENT_SUPPORTED:
-				setEventSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_UDF_SUPPORTED:
-				setSqlUDFSupported(((Boolean)newValue).booleanValue());
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_SUPPORTED:
-				setStoredProcedureSupported(((Boolean)newValue).booleanValue());
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
-				getPredefinedDataTypeDefinitions().clear();
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_SPACE_DEFINITION:
-				setTableSpaceDefinition((TableSpaceDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_DEFINITION:
-				setStoredProcedureDefinition((StoredProcedureDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_DEFINITION:
-				setTriggerDefinition((TriggerDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__COLUMN_DEFINITION:
-				setColumnDefinition((ColumnDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINT_DEFINITION:
-				setConstraintDefinition((ConstraintDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EXTENDED_DEFINITIONS:
-				getExtendedDefinitions().clear();
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__INDEX_DEFINITION:
-				setIndexDefinition((IndexDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_DEFINITION:
-				setTableDefinition((TableDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_DEFINITION:
-				setSequenceDefinition((SequenceDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__UDT_DEFINITION:
-				setUdtDefinition((UserDefinedTypeDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUERY_DEFINITION:
-				setQueryDefinition((QueryDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_SYNTAX_DEFINITION:
-				setSQLSyntaxDefinition((SQLSyntaxDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_DEFINITION:
-				setNicknameDefinition((NicknameDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_DEFINITION:
-				setSchemaDefinition((SchemaDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_DEFINITION:
-				setViewDefinition((ViewDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DEBUGGER_DEFINITION:
-				setDebuggerDefinition((DebuggerDefinition)null);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VENDOR:
-				setVendor(VENDOR_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINTS_SUPPORTED:
-				setConstraintsSupported(CONSTRAINTS_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
-				setMaximumIdentifierLength(MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_SUPPORTED:
-				setTriggerSupported(TRIGGER_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SNAPSHOT_VIEW_SUPPORTED:
-				setSnapshotViewSupported(SNAPSHOT_VIEW_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__JOIN_SUPPORTED:
-				setJoinSupported(JOIN_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_TRIGGER_SUPPORTED:
-				setViewTriggerSupported(VIEW_TRIGGER_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLESPACES_SUPPORTED:
-				setTablespacesSupported(TABLESPACES_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_COMMENT_LENGTH:
-				setMaximumCommentLength(MAXIMUM_COMMENT_LENGTH_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_SUPPORTED:
-				setSequenceSupported(SEQUENCE_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_SUPPORTED:
-				setMQTSupported(MQT_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_SUPPORTED:
-				setSchemaSupported(SCHEMA_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__ALIAS_SUPPORTED:
-				setAliasSupported(ALIAS_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SYNONYM_SUPPORTED:
-				setSynonymSupported(SYNONYM_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__USER_DEFINED_TYPE_SUPPORTED:
-				setUserDefinedTypeSupported(USER_DEFINED_TYPE_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DOMAIN_SUPPORTED:
-				setDomainSupported(DOMAIN_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_STATEMENT_SUPPORTED:
-				setSQLStatementSupported(SQL_STATEMENT_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_SUPPORTED:
-				setNicknameSupported(NICKNAME_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DML_SUPPORTED:
-				setQuotedDMLSupported(QUOTED_DML_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DDL_SUPPORTED:
-				setQuotedDDLSupported(QUOTED_DDL_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__XML_SUPPORTED:
-				setXmlSupported(XML_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_INDEX_SUPPORTED:
-				setMQTIndexSupported(MQT_INDEX_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EVENT_SUPPORTED:
-				setEventSupported(EVENT_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_UDF_SUPPORTED:
-				setSqlUDFSupported(SQL_UDF_SUPPORTED_EDEFAULT);
-				return;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_SUPPORTED:
-				setStoredProcedureSupported(STORED_PROCEDURE_SUPPORTED_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
-				return predefinedDataTypeDefinitions != null && !predefinedDataTypeDefinitions.isEmpty();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_SPACE_DEFINITION:
-				return tableSpaceDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_DEFINITION:
-				return storedProcedureDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_DEFINITION:
-				return triggerDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__COLUMN_DEFINITION:
-				return columnDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINT_DEFINITION:
-				return constraintDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EXTENDED_DEFINITIONS:
-				return extendedDefinitions != null && !extendedDefinitions.isEmpty();
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__INDEX_DEFINITION:
-				return indexDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLE_DEFINITION:
-				return tableDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_DEFINITION:
-				return sequenceDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__UDT_DEFINITION:
-				return udtDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUERY_DEFINITION:
-				return queryDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_SYNTAX_DEFINITION:
-				return sqlSyntaxDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_DEFINITION:
-				return nicknameDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_DEFINITION:
-				return schemaDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_DEFINITION:
-				return viewDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DEBUGGER_DEFINITION:
-				return debuggerDefinition != null;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VENDOR:
-				return VENDOR_EDEFAULT == null ? vendor != null : !VENDOR_EDEFAULT.equals(vendor);
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__CONSTRAINTS_SUPPORTED:
-				return constraintsSupported != CONSTRAINTS_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
-				return maximumIdentifierLength != MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TRIGGER_SUPPORTED:
-				return triggerSupported != TRIGGER_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SNAPSHOT_VIEW_SUPPORTED:
-				return snapshotViewSupported != SNAPSHOT_VIEW_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__JOIN_SUPPORTED:
-				return joinSupported != JOIN_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__VIEW_TRIGGER_SUPPORTED:
-				return viewTriggerSupported != VIEW_TRIGGER_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__TABLESPACES_SUPPORTED:
-				return tablespacesSupported != TABLESPACES_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MAXIMUM_COMMENT_LENGTH:
-				return maximumCommentLength != MAXIMUM_COMMENT_LENGTH_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SEQUENCE_SUPPORTED:
-				return sequenceSupported != SEQUENCE_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_SUPPORTED:
-				return mQTSupported != MQT_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SCHEMA_SUPPORTED:
-				return schemaSupported != SCHEMA_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__ALIAS_SUPPORTED:
-				return aliasSupported != ALIAS_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SYNONYM_SUPPORTED:
-				return synonymSupported != SYNONYM_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__USER_DEFINED_TYPE_SUPPORTED:
-				return userDefinedTypeSupported != USER_DEFINED_TYPE_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__DOMAIN_SUPPORTED:
-				return domainSupported != DOMAIN_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_STATEMENT_SUPPORTED:
-				return sqlStatementSupported != SQL_STATEMENT_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__NICKNAME_SUPPORTED:
-				return nicknameSupported != NICKNAME_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DML_SUPPORTED:
-				return quotedDMLSupported != QUOTED_DML_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__QUOTED_DDL_SUPPORTED:
-				return quotedDDLSupported != QUOTED_DDL_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__XML_SUPPORTED:
-				return xmlSupported != XML_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__MQT_INDEX_SUPPORTED:
-				return mQTIndexSupported != MQT_INDEX_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__EVENT_SUPPORTED:
-				return eventSupported != EVENT_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__SQL_UDF_SUPPORTED:
-				return sqlUDFSupported != SQL_UDF_SUPPORTED_EDEFAULT;
-			case DatabaseDefinitionPackage.DATABASE_VENDOR_DEFINITION__STORED_PROCEDURE_SUPPORTED:
-				return storedProcedureSupported != STORED_PROCEDURE_SUPPORTED_EDEFAULT;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DebuggerDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DebuggerDefinitionImpl.java
index 3a22ccb..a749599 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DebuggerDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/DebuggerDefinitionImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id$
+ * $Id: DebuggerDefinitionImpl.java,v 1.1 2006/02/27 23:19:06 dpchou Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition.impl;
 
@@ -66,7 +66,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getDebuggerDefinition();
+		return DatabaseDefinitionPackage.Literals.DEBUGGER_DEFINITION;
 	}
 
 	/**
@@ -95,12 +95,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.DEBUGGER_DEFINITION__CONDITION_SUPPORTED:
 				return isConditionSupported() ? Boolean.TRUE : Boolean.FALSE;
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -108,13 +108,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.DEBUGGER_DEFINITION__CONDITION_SUPPORTED:
 				setConditionSupported(((Boolean)newValue).booleanValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -122,13 +122,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.DEBUGGER_DEFINITION__CONDITION_SUPPORTED:
 				setConditionSupported(CONDITION_SUPPORTED_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -136,12 +136,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.DEBUGGER_DEFINITION__CONDITION_SUPPORTED:
 				return conditionSupported != CONDITION_SUPPORTED_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ExtendedDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ExtendedDefinitionImpl.java
index 0dbd704..f0fae35 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ExtendedDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ExtendedDefinitionImpl.java
@@ -88,7 +88,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getExtendedDefinition();
+		return DatabaseDefinitionPackage.Literals.EXTENDED_DEFINITION;
 	}
 
 	/**
@@ -138,14 +138,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.EXTENDED_DEFINITION__NAME:
 				return getName();
 			case DatabaseDefinitionPackage.EXTENDED_DEFINITION__VALUE:
 				return getValue();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -153,8 +153,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.EXTENDED_DEFINITION__NAME:
 				setName((String)newValue);
 				return;
@@ -162,7 +162,7 @@
 				setValue((String)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -170,8 +170,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.EXTENDED_DEFINITION__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -179,7 +179,7 @@
 				setValue(VALUE_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -187,14 +187,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.EXTENDED_DEFINITION__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case DatabaseDefinitionPackage.EXTENDED_DEFINITION__VALUE:
 				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/FieldQualifierDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/FieldQualifierDefinitionImpl.java
index 0459ac7..39389cb 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/FieldQualifierDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/FieldQualifierDefinitionImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id$
+ * $Id: FieldQualifierDefinitionImpl.java,v 1.1 2006/03/09 23:48:17 dpchou Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition.impl;
 
@@ -211,7 +211,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getFieldQualifierDefinition();
+		return DatabaseDefinitionPackage.Literals.FIELD_QUALIFIER_DEFINITION;
 	}
 
 	/**
@@ -378,8 +378,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.FIELD_QUALIFIER_DEFINITION__VALID_TRAILING_FIELD_QUALIFIER_DEFINITIONS:
 				return getValidTrailingFieldQualifierDefinitions();
 			case DatabaseDefinitionPackage.FIELD_QUALIFIER_DEFINITION__NAME:
@@ -397,7 +397,7 @@
 			case DatabaseDefinitionPackage.FIELD_QUALIFIER_DEFINITION__SCALE_SUPPORTED:
 				return isScaleSupported() ? Boolean.TRUE : Boolean.FALSE;
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -405,8 +405,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.FIELD_QUALIFIER_DEFINITION__VALID_TRAILING_FIELD_QUALIFIER_DEFINITIONS:
 				getValidTrailingFieldQualifierDefinitions().clear();
 				getValidTrailingFieldQualifierDefinitions().addAll((Collection)newValue);
@@ -433,7 +433,7 @@
 				setScaleSupported(((Boolean)newValue).booleanValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -441,8 +441,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.FIELD_QUALIFIER_DEFINITION__VALID_TRAILING_FIELD_QUALIFIER_DEFINITIONS:
 				getValidTrailingFieldQualifierDefinitions().clear();
 				return;
@@ -468,7 +468,7 @@
 				setScaleSupported(SCALE_SUPPORTED_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -476,8 +476,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.FIELD_QUALIFIER_DEFINITION__VALID_TRAILING_FIELD_QUALIFIER_DEFINITIONS:
 				return validTrailingFieldQualifierDefinitions != null && !validTrailingFieldQualifierDefinitions.isEmpty();
 			case DatabaseDefinitionPackage.FIELD_QUALIFIER_DEFINITION__NAME:
@@ -495,7 +495,7 @@
 			case DatabaseDefinitionPackage.FIELD_QUALIFIER_DEFINITION__SCALE_SUPPORTED:
 				return scaleSupported != SCALE_SUPPORTED_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/IndexDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/IndexDefinitionImpl.java
index 06afe96..9eed99d 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/IndexDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/IndexDefinitionImpl.java
@@ -194,7 +194,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getIndexDefinition();
+		return DatabaseDefinitionPackage.Literals.INDEX_DEFINITION;
 	}
 
 	/**
@@ -349,8 +349,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.INDEX_DEFINITION__PERCENT_FREE_TERMINOLOGY:
 				return getPercentFreeTerminology();
 			case DatabaseDefinitionPackage.INDEX_DEFINITION__PERCENT_FREE_CHANGEABLE:
@@ -366,7 +366,7 @@
 			case DatabaseDefinitionPackage.INDEX_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return new Integer(getMaximumIdentifierLength());
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -374,8 +374,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.INDEX_DEFINITION__PERCENT_FREE_TERMINOLOGY:
 				setPercentFreeTerminology((PercentFreeTerminology)newValue);
 				return;
@@ -398,7 +398,7 @@
 				setMaximumIdentifierLength(((Integer)newValue).intValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -406,8 +406,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.INDEX_DEFINITION__PERCENT_FREE_TERMINOLOGY:
 				setPercentFreeTerminology(PERCENT_FREE_TERMINOLOGY_EDEFAULT);
 				return;
@@ -430,7 +430,7 @@
 				setMaximumIdentifierLength(MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -438,8 +438,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.INDEX_DEFINITION__PERCENT_FREE_TERMINOLOGY:
 				return percentFreeTerminology != PERCENT_FREE_TERMINOLOGY_EDEFAULT;
 			case DatabaseDefinitionPackage.INDEX_DEFINITION__PERCENT_FREE_CHANGEABLE:
@@ -455,7 +455,7 @@
 			case DatabaseDefinitionPackage.INDEX_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return maximumIdentifierLength != MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/NicknameDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/NicknameDefinitionImpl.java
index 282ed60..9f4deea 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/NicknameDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/NicknameDefinitionImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: NicknameDefinitionImpl.java,v 1.1 2005/08/02 22:56:23 ledunnel Exp $
+ * $Id: NicknameDefinitionImpl.java,v 1.2 2006/03/09 23:48:17 dpchou Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition.impl;
 
@@ -108,7 +108,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getNicknameDefinition();
+		return DatabaseDefinitionPackage.Literals.NICKNAME_DEFINITION;
 	}
 
 	/**
@@ -179,8 +179,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.NICKNAME_DEFINITION__CONSTRAINT_SUPPORTED:
 				return isConstraintSupported() ? Boolean.TRUE : Boolean.FALSE;
 			case DatabaseDefinitionPackage.NICKNAME_DEFINITION__INDEX_SUPPORTED:
@@ -188,7 +188,7 @@
 			case DatabaseDefinitionPackage.NICKNAME_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return new Integer(getMaximumIdentifierLength());
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -196,8 +196,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.NICKNAME_DEFINITION__CONSTRAINT_SUPPORTED:
 				setConstraintSupported(((Boolean)newValue).booleanValue());
 				return;
@@ -208,7 +208,7 @@
 				setMaximumIdentifierLength(((Integer)newValue).intValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -216,8 +216,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.NICKNAME_DEFINITION__CONSTRAINT_SUPPORTED:
 				setConstraintSupported(CONSTRAINT_SUPPORTED_EDEFAULT);
 				return;
@@ -228,7 +228,7 @@
 				setMaximumIdentifierLength(MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -236,8 +236,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.NICKNAME_DEFINITION__CONSTRAINT_SUPPORTED:
 				return constraintSupported != CONSTRAINT_SUPPORTED_EDEFAULT;
 			case DatabaseDefinitionPackage.NICKNAME_DEFINITION__INDEX_SUPPORTED:
@@ -245,7 +245,7 @@
 			case DatabaseDefinitionPackage.NICKNAME_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return maximumIdentifierLength != MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/PredefinedDataTypeDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/PredefinedDataTypeDefinitionImpl.java
index 9645347..0c5b599 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/PredefinedDataTypeDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/PredefinedDataTypeDefinitionImpl.java
@@ -863,7 +863,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getPredefinedDataTypeDefinition();
+		return DatabaseDefinitionPackage.Literals.PREDEFINED_DATA_TYPE_DEFINITION;
 	}
 
 	/**
@@ -897,8 +897,8 @@
 	 */
 	public FieldQualifierDefinition getDefaultTrailingFieldQualifierDefinition() {
 		if (defaultTrailingFieldQualifierDefinition != null && defaultTrailingFieldQualifierDefinition.eIsProxy()) {
-			FieldQualifierDefinition oldDefaultTrailingFieldQualifierDefinition = defaultTrailingFieldQualifierDefinition;
-			defaultTrailingFieldQualifierDefinition = (FieldQualifierDefinition)eResolveProxy((InternalEObject)defaultTrailingFieldQualifierDefinition);
+			InternalEObject oldDefaultTrailingFieldQualifierDefinition = (InternalEObject)defaultTrailingFieldQualifierDefinition;
+			defaultTrailingFieldQualifierDefinition = (FieldQualifierDefinition)eResolveProxy(oldDefaultTrailingFieldQualifierDefinition);
 			if (defaultTrailingFieldQualifierDefinition != oldDefaultTrailingFieldQualifierDefinition) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__DEFAULT_TRAILING_FIELD_QUALIFIER_DEFINITION, oldDefaultTrailingFieldQualifierDefinition, defaultTrailingFieldQualifierDefinition));
@@ -935,8 +935,8 @@
 	 */
 	public FieldQualifierDefinition getDefaultLeadingFieldQualifierDefinition() {
 		if (defaultLeadingFieldQualifierDefinition != null && defaultLeadingFieldQualifierDefinition.eIsProxy()) {
-			FieldQualifierDefinition oldDefaultLeadingFieldQualifierDefinition = defaultLeadingFieldQualifierDefinition;
-			defaultLeadingFieldQualifierDefinition = (FieldQualifierDefinition)eResolveProxy((InternalEObject)defaultLeadingFieldQualifierDefinition);
+			InternalEObject oldDefaultLeadingFieldQualifierDefinition = (InternalEObject)defaultLeadingFieldQualifierDefinition;
+			defaultLeadingFieldQualifierDefinition = (FieldQualifierDefinition)eResolveProxy(oldDefaultLeadingFieldQualifierDefinition);
 			if (defaultLeadingFieldQualifierDefinition != oldDefaultLeadingFieldQualifierDefinition) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__DEFAULT_LEADING_FIELD_QUALIFIER_DEFINITION, oldDefaultLeadingFieldQualifierDefinition, defaultLeadingFieldQualifierDefinition));
@@ -1733,18 +1733,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__LEADING_FIELD_QUALIFIER_DEFINITION:
-					return ((InternalEList)getLeadingFieldQualifierDefinition()).basicRemove(otherEnd, msgs);
-				case DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__TRAILING_FIELD_QUALIFIER_DEFINITION:
-					return ((InternalEList)getTrailingFieldQualifierDefinition()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__LEADING_FIELD_QUALIFIER_DEFINITION:
+				return ((InternalEList)getLeadingFieldQualifierDefinition()).basicRemove(otherEnd, msgs);
+			case DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__TRAILING_FIELD_QUALIFIER_DEFINITION:
+				return ((InternalEList)getTrailingFieldQualifierDefinition()).basicRemove(otherEnd, msgs);
 		}
-		return eBasicSetContainer(null, featureID, msgs);
+		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -1752,8 +1748,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__LEADING_FIELD_QUALIFIER_DEFINITION:
 				return getLeadingFieldQualifierDefinition();
 			case DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__TRAILING_FIELD_QUALIFIER_DEFINITION:
@@ -1841,7 +1837,7 @@
 			case DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__FIELD_QUALIFIER_SEPARATOR:
 				return getFieldQualifierSeparator();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -1849,8 +1845,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__LEADING_FIELD_QUALIFIER_DEFINITION:
 				getLeadingFieldQualifierDefinition().clear();
 				getLeadingFieldQualifierDefinition().addAll((Collection)newValue);
@@ -1984,7 +1980,7 @@
 				setFieldQualifierSeparator((String)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -1992,8 +1988,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__LEADING_FIELD_QUALIFIER_DEFINITION:
 				getLeadingFieldQualifierDefinition().clear();
 				return;
@@ -2121,7 +2117,7 @@
 				setFieldQualifierSeparator(FIELD_QUALIFIER_SEPARATOR_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -2129,8 +2125,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__LEADING_FIELD_QUALIFIER_DEFINITION:
 				return leadingFieldQualifierDefinition != null && !leadingFieldQualifierDefinition.isEmpty();
 			case DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__TRAILING_FIELD_QUALIFIER_DEFINITION:
@@ -2216,7 +2212,7 @@
 			case DatabaseDefinitionPackage.PREDEFINED_DATA_TYPE_DEFINITION__FIELD_QUALIFIER_SEPARATOR:
 				return FIELD_QUALIFIER_SEPARATOR_EDEFAULT == null ? fieldQualifierSeparator != null : !FIELD_QUALIFIER_SEPARATOR_EDEFAULT.equals(fieldQualifierSeparator);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/QueryDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/QueryDefinitionImpl.java
index 8af46f8..c23f2da 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/QueryDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/QueryDefinitionImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: QueryDefinitionImpl.java,v 1.3 2005/06/15 18:16:00 ledunnel Exp $
+ * $Id: QueryDefinitionImpl.java,v 1.1 2005/08/02 22:56:23 ledunnel Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition.impl;
 
@@ -192,7 +192,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getQueryDefinition();
+		return DatabaseDefinitionPackage.Literals.QUERY_DEFINITION;
 	}
 
 	/**
@@ -347,8 +347,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.QUERY_DEFINITION__IDENTIFIER_QUOTE_STRING:
 				return getIdentifierQuoteString();
 			case DatabaseDefinitionPackage.QUERY_DEFINITION__HOST_VARIABLE_MARKER:
@@ -364,7 +364,7 @@
 			case DatabaseDefinitionPackage.QUERY_DEFINITION__TABLE_ALIAS_IN_DELETE_SUPPORTED:
 				return isTableAliasInDeleteSupported() ? Boolean.TRUE : Boolean.FALSE;
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -372,8 +372,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.QUERY_DEFINITION__IDENTIFIER_QUOTE_STRING:
 				setIdentifierQuoteString((String)newValue);
 				return;
@@ -396,7 +396,7 @@
 				setTableAliasInDeleteSupported(((Boolean)newValue).booleanValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -404,8 +404,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.QUERY_DEFINITION__IDENTIFIER_QUOTE_STRING:
 				setIdentifierQuoteString(IDENTIFIER_QUOTE_STRING_EDEFAULT);
 				return;
@@ -428,7 +428,7 @@
 				setTableAliasInDeleteSupported(TABLE_ALIAS_IN_DELETE_SUPPORTED_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -436,8 +436,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.QUERY_DEFINITION__IDENTIFIER_QUOTE_STRING:
 				return IDENTIFIER_QUOTE_STRING_EDEFAULT == null ? identifierQuoteString != null : !IDENTIFIER_QUOTE_STRING_EDEFAULT.equals(identifierQuoteString);
 			case DatabaseDefinitionPackage.QUERY_DEFINITION__HOST_VARIABLE_MARKER:
@@ -453,7 +453,7 @@
 			case DatabaseDefinitionPackage.QUERY_DEFINITION__TABLE_ALIAS_IN_DELETE_SUPPORTED:
 				return tableAliasInDeleteSupported != TABLE_ALIAS_IN_DELETE_SUPPORTED_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/SQLSyntaxDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/SQLSyntaxDefinitionImpl.java
index a3575f8..7b1b1e1 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/SQLSyntaxDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/SQLSyntaxDefinitionImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SQLSyntaxDefinitionImpl.java,v 1.1 2005/08/02 22:56:23 ledunnel Exp $
+ * $Id: SQLSyntaxDefinitionImpl.java,v 1.2 2006/03/09 23:48:17 dpchou Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition.impl;
 
@@ -94,7 +94,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getSQLSyntaxDefinition();
+		return DatabaseDefinitionPackage.Literals.SQL_SYNTAX_DEFINITION;
 	}
 
 	/**
@@ -147,8 +147,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.SQL_SYNTAX_DEFINITION__KEYWORDS:
 				return getKeywords();
 			case DatabaseDefinitionPackage.SQL_SYNTAX_DEFINITION__OPERATORS:
@@ -156,7 +156,7 @@
 			case DatabaseDefinitionPackage.SQL_SYNTAX_DEFINITION__TERMINATION_CHARACTER:
 				return getTerminationCharacter();
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -164,8 +164,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.SQL_SYNTAX_DEFINITION__KEYWORDS:
 				getKeywords().clear();
 				getKeywords().addAll((Collection)newValue);
@@ -178,7 +178,7 @@
 				setTerminationCharacter((String)newValue);
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -186,8 +186,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.SQL_SYNTAX_DEFINITION__KEYWORDS:
 				getKeywords().clear();
 				return;
@@ -198,7 +198,7 @@
 				setTerminationCharacter(TERMINATION_CHARACTER_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -206,8 +206,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.SQL_SYNTAX_DEFINITION__KEYWORDS:
 				return keywords != null && !keywords.isEmpty();
 			case DatabaseDefinitionPackage.SQL_SYNTAX_DEFINITION__OPERATORS:
@@ -215,7 +215,7 @@
 			case DatabaseDefinitionPackage.SQL_SYNTAX_DEFINITION__TERMINATION_CHARACTER:
 				return TERMINATION_CHARACTER_EDEFAULT == null ? terminationCharacter != null : !TERMINATION_CHARACTER_EDEFAULT.equals(terminationCharacter);
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/SchemaDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/SchemaDefinitionImpl.java
index 931d6ae..33708ff 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/SchemaDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/SchemaDefinitionImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id$
+ * $Id: SchemaDefinitionImpl.java,v 1.1 2006/03/09 23:48:17 dpchou Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition.impl;
 
@@ -66,7 +66,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getSchemaDefinition();
+		return DatabaseDefinitionPackage.Literals.SCHEMA_DEFINITION;
 	}
 
 	/**
@@ -95,12 +95,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.SCHEMA_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return new Integer(getMaximumIdentifierLength());
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -108,13 +108,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.SCHEMA_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				setMaximumIdentifierLength(((Integer)newValue).intValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -122,13 +122,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.SCHEMA_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				setMaximumIdentifierLength(MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -136,12 +136,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.SCHEMA_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return maximumIdentifierLength != MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/SequenceDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/SequenceDefinitionImpl.java
index 64a29c2..84b2879 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/SequenceDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/SequenceDefinitionImpl.java
@@ -221,7 +221,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getSequenceDefinition();
+		return DatabaseDefinitionPackage.Literals.SEQUENCE_DEFINITION;
 	}
 
 	/**
@@ -388,46 +388,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PredefinedDataTypeDefinition getDefaultDataTypeDefinition() {
-		if (defaultDataTypeDefinition != null && defaultDataTypeDefinition.eIsProxy()) {
-			PredefinedDataTypeDefinition oldDefaultDataTypeDefinition = defaultDataTypeDefinition;
-			defaultDataTypeDefinition = (PredefinedDataTypeDefinition)eResolveProxy((InternalEObject)defaultDataTypeDefinition);
-			if (defaultDataTypeDefinition != oldDefaultDataTypeDefinition) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DatabaseDefinitionPackage.SEQUENCE_DEFINITION__DEFAULT_DATA_TYPE_DEFINITION, oldDefaultDataTypeDefinition, defaultDataTypeDefinition));
-			}
-		}
-		return defaultDataTypeDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredefinedDataTypeDefinition basicGetDefaultDataTypeDefinition() {
-		return defaultDataTypeDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultDataTypeDefinition(PredefinedDataTypeDefinition newDefaultDataTypeDefinition) {
-		PredefinedDataTypeDefinition oldDefaultDataTypeDefinition = defaultDataTypeDefinition;
-		defaultDataTypeDefinition = newDefaultDataTypeDefinition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DatabaseDefinitionPackage.SEQUENCE_DEFINITION__DEFAULT_DATA_TYPE_DEFINITION, oldDefaultDataTypeDefinition, defaultDataTypeDefinition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.SEQUENCE_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
 				return getPredefinedDataTypeDefinitions();
 			case DatabaseDefinitionPackage.SEQUENCE_DEFINITION__DEFAULT_DATA_TYPE_DEFINITION:
@@ -448,7 +410,7 @@
 			case DatabaseDefinitionPackage.SEQUENCE_DEFINITION__CACHE_DEFAULT_VALUE:
 				return new Integer(getCacheDefaultValue());
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -456,8 +418,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.SEQUENCE_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
 				getPredefinedDataTypeDefinitions().clear();
 				getPredefinedDataTypeDefinitions().addAll((Collection)newValue);
@@ -487,7 +449,7 @@
 				setCacheDefaultValue(((Integer)newValue).intValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -495,8 +457,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.SEQUENCE_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
 				getPredefinedDataTypeDefinitions().clear();
 				return;
@@ -525,7 +487,7 @@
 				setCacheDefaultValue(CACHE_DEFAULT_VALUE_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -533,8 +495,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.SEQUENCE_DEFINITION__PREDEFINED_DATA_TYPE_DEFINITIONS:
 				return predefinedDataTypeDefinitions != null && !predefinedDataTypeDefinitions.isEmpty();
 			case DatabaseDefinitionPackage.SEQUENCE_DEFINITION__DEFAULT_DATA_TYPE_DEFINITION:
@@ -554,7 +516,45 @@
 			case DatabaseDefinitionPackage.SEQUENCE_DEFINITION__CACHE_DEFAULT_VALUE:
 				return cacheDefaultValue != CACHE_DEFAULT_VALUE_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PredefinedDataTypeDefinition getDefaultDataTypeDefinition() {
+		if (defaultDataTypeDefinition != null && defaultDataTypeDefinition.eIsProxy()) {
+			InternalEObject oldDefaultDataTypeDefinition = (InternalEObject)defaultDataTypeDefinition;
+			defaultDataTypeDefinition = (PredefinedDataTypeDefinition)eResolveProxy(oldDefaultDataTypeDefinition);
+			if (defaultDataTypeDefinition != oldDefaultDataTypeDefinition) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DatabaseDefinitionPackage.SEQUENCE_DEFINITION__DEFAULT_DATA_TYPE_DEFINITION, oldDefaultDataTypeDefinition, defaultDataTypeDefinition));
+			}
+		}
+		return defaultDataTypeDefinition;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PredefinedDataTypeDefinition basicGetDefaultDataTypeDefinition() {
+		return defaultDataTypeDefinition;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDefaultDataTypeDefinition(PredefinedDataTypeDefinition newDefaultDataTypeDefinition) {
+		PredefinedDataTypeDefinition oldDefaultDataTypeDefinition = defaultDataTypeDefinition;
+		defaultDataTypeDefinition = newDefaultDataTypeDefinition;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DatabaseDefinitionPackage.SEQUENCE_DEFINITION__DEFAULT_DATA_TYPE_DEFINITION, oldDefaultDataTypeDefinition, defaultDataTypeDefinition));
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/StoredProcedureDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/StoredProcedureDefinitionImpl.java
index 3c18855..56541b5 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/StoredProcedureDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/StoredProcedureDefinitionImpl.java
@@ -328,7 +328,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getStoredProcedureDefinition();
+		return DatabaseDefinitionPackage.Literals.STORED_PROCEDURE_DEFINITION;
 	}
 
 	/**
@@ -615,8 +615,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.STORED_PROCEDURE_DEFINITION__NULL_INPUT_ACTION_SUPPORTED:
 				return isNullInputActionSupported() ? Boolean.TRUE : Boolean.FALSE;
 			case DatabaseDefinitionPackage.STORED_PROCEDURE_DEFINITION__PACKAGE_GENERATION_SUPPORTED:
@@ -648,7 +648,7 @@
 			case DatabaseDefinitionPackage.STORED_PROCEDURE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return new Integer(getMaximumIdentifierLength());
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -656,8 +656,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.STORED_PROCEDURE_DEFINITION__NULL_INPUT_ACTION_SUPPORTED:
 				setNullInputActionSupported(((Boolean)newValue).booleanValue());
 				return;
@@ -708,7 +708,7 @@
 				setMaximumIdentifierLength(((Integer)newValue).intValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -716,8 +716,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.STORED_PROCEDURE_DEFINITION__NULL_INPUT_ACTION_SUPPORTED:
 				setNullInputActionSupported(NULL_INPUT_ACTION_SUPPORTED_EDEFAULT);
 				return;
@@ -764,7 +764,7 @@
 				setMaximumIdentifierLength(MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -772,8 +772,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.STORED_PROCEDURE_DEFINITION__NULL_INPUT_ACTION_SUPPORTED:
 				return nullInputActionSupported != NULL_INPUT_ACTION_SUPPORTED_EDEFAULT;
 			case DatabaseDefinitionPackage.STORED_PROCEDURE_DEFINITION__PACKAGE_GENERATION_SUPPORTED:
@@ -805,7 +805,7 @@
 			case DatabaseDefinitionPackage.STORED_PROCEDURE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return maximumIdentifierLength != MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/TableDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/TableDefinitionImpl.java
index 4a5a604..736dda8 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/TableDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/TableDefinitionImpl.java
@@ -172,7 +172,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getTableDefinition();
+		return DatabaseDefinitionPackage.Literals.TABLE_DEFINITION;
 	}
 
 	/**
@@ -306,8 +306,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.TABLE_DEFINITION__AUDIT_SUPPORTED:
 				return isAuditSupported() ? Boolean.TRUE : Boolean.FALSE;
 			case DatabaseDefinitionPackage.TABLE_DEFINITION__DATA_CAPTURE_SUPPORTED:
@@ -321,7 +321,7 @@
 			case DatabaseDefinitionPackage.TABLE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return new Integer(getMaximumIdentifierLength());
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -329,8 +329,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.TABLE_DEFINITION__AUDIT_SUPPORTED:
 				setAuditSupported(((Boolean)newValue).booleanValue());
 				return;
@@ -350,7 +350,7 @@
 				setMaximumIdentifierLength(((Integer)newValue).intValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -358,8 +358,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.TABLE_DEFINITION__AUDIT_SUPPORTED:
 				setAuditSupported(AUDIT_SUPPORTED_EDEFAULT);
 				return;
@@ -379,7 +379,7 @@
 				setMaximumIdentifierLength(MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -387,8 +387,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.TABLE_DEFINITION__AUDIT_SUPPORTED:
 				return auditSupported != AUDIT_SUPPORTED_EDEFAULT;
 			case DatabaseDefinitionPackage.TABLE_DEFINITION__DATA_CAPTURE_SUPPORTED:
@@ -402,7 +402,7 @@
 			case DatabaseDefinitionPackage.TABLE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return maximumIdentifierLength != MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/TableSpaceDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/TableSpaceDefinitionImpl.java
index f4f8e36..f8382c4 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/TableSpaceDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/TableSpaceDefinitionImpl.java
@@ -293,7 +293,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getTableSpaceDefinition();
+		return DatabaseDefinitionPackage.Literals.TABLE_SPACE_DEFINITION;
 	}
 
 	/**
@@ -544,8 +544,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.TABLE_SPACE_DEFINITION__TYPE_SUPPORTED:
 				return isTypeSupported() ? Boolean.TRUE : Boolean.FALSE;
 			case DatabaseDefinitionPackage.TABLE_SPACE_DEFINITION__EXTENT_SIZE_SUPPORTED:
@@ -571,7 +571,7 @@
 			case DatabaseDefinitionPackage.TABLE_SPACE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return new Integer(getMaximumIdentifierLength());
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -579,8 +579,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.TABLE_SPACE_DEFINITION__TYPE_SUPPORTED:
 				setTypeSupported(((Boolean)newValue).booleanValue());
 				return;
@@ -619,7 +619,7 @@
 				setMaximumIdentifierLength(((Integer)newValue).intValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -627,8 +627,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.TABLE_SPACE_DEFINITION__TYPE_SUPPORTED:
 				setTypeSupported(TYPE_SUPPORTED_EDEFAULT);
 				return;
@@ -666,7 +666,7 @@
 				setMaximumIdentifierLength(MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -674,8 +674,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.TABLE_SPACE_DEFINITION__TYPE_SUPPORTED:
 				return typeSupported != TYPE_SUPPORTED_EDEFAULT;
 			case DatabaseDefinitionPackage.TABLE_SPACE_DEFINITION__EXTENT_SIZE_SUPPORTED:
@@ -701,7 +701,7 @@
 			case DatabaseDefinitionPackage.TABLE_SPACE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return maximumIdentifierLength != MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/TriggerDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/TriggerDefinitionImpl.java
index 4881a51..1aaddfd 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/TriggerDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/TriggerDefinitionImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TriggerDefinitionImpl.java,v 1.1 2005/08/02 22:56:23 ledunnel Exp $
+ * $Id: TriggerDefinitionImpl.java,v 1.2 2006/03/09 23:48:17 dpchou Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition.impl;
 
@@ -276,7 +276,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getTriggerDefinition();
+		return DatabaseDefinitionPackage.Literals.TRIGGER_DEFINITION;
 	}
 
 	/**
@@ -515,8 +515,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.TRIGGER_DEFINITION__MAXIMUM_REFERENCE_PART_LENGTH:
 				return new Integer(getMaximumReferencePartLength());
 			case DatabaseDefinitionPackage.TRIGGER_DEFINITION__MAXIMUM_ACTION_BODY_LENGTH:
@@ -540,7 +540,7 @@
 			case DatabaseDefinitionPackage.TRIGGER_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return new Integer(getMaximumIdentifierLength());
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -548,8 +548,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.TRIGGER_DEFINITION__MAXIMUM_REFERENCE_PART_LENGTH:
 				setMaximumReferencePartLength(((Integer)newValue).intValue());
 				return;
@@ -584,7 +584,7 @@
 				setMaximumIdentifierLength(((Integer)newValue).intValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -592,8 +592,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.TRIGGER_DEFINITION__MAXIMUM_REFERENCE_PART_LENGTH:
 				setMaximumReferencePartLength(MAXIMUM_REFERENCE_PART_LENGTH_EDEFAULT);
 				return;
@@ -628,7 +628,7 @@
 				setMaximumIdentifierLength(MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -636,8 +636,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.TRIGGER_DEFINITION__MAXIMUM_REFERENCE_PART_LENGTH:
 				return maximumReferencePartLength != MAXIMUM_REFERENCE_PART_LENGTH_EDEFAULT;
 			case DatabaseDefinitionPackage.TRIGGER_DEFINITION__MAXIMUM_ACTION_BODY_LENGTH:
@@ -661,7 +661,7 @@
 			case DatabaseDefinitionPackage.TRIGGER_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return maximumIdentifierLength != MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/UserDefinedTypeDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/UserDefinedTypeDefinitionImpl.java
index 1b5c7a4..da3c0cd 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/UserDefinedTypeDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/UserDefinedTypeDefinitionImpl.java
@@ -130,7 +130,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getUserDefinedTypeDefinition();
+		return DatabaseDefinitionPackage.Literals.USER_DEFINED_TYPE_DEFINITION;
 	}
 
 	/**
@@ -222,8 +222,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.USER_DEFINED_TYPE_DEFINITION__DEFAULT_VALUE_SUPPORTED:
 				return isDefaultValueSupported() ? Boolean.TRUE : Boolean.FALSE;
 			case DatabaseDefinitionPackage.USER_DEFINED_TYPE_DEFINITION__DISTINCT_TYPE_SUPPORTED:
@@ -233,7 +233,7 @@
 			case DatabaseDefinitionPackage.USER_DEFINED_TYPE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return new Integer(getMaximumIdentifierLength());
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -241,8 +241,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.USER_DEFINED_TYPE_DEFINITION__DEFAULT_VALUE_SUPPORTED:
 				setDefaultValueSupported(((Boolean)newValue).booleanValue());
 				return;
@@ -256,7 +256,7 @@
 				setMaximumIdentifierLength(((Integer)newValue).intValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -264,8 +264,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.USER_DEFINED_TYPE_DEFINITION__DEFAULT_VALUE_SUPPORTED:
 				setDefaultValueSupported(DEFAULT_VALUE_SUPPORTED_EDEFAULT);
 				return;
@@ -279,7 +279,7 @@
 				setMaximumIdentifierLength(MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -287,8 +287,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.USER_DEFINED_TYPE_DEFINITION__DEFAULT_VALUE_SUPPORTED:
 				return defaultValueSupported != DEFAULT_VALUE_SUPPORTED_EDEFAULT;
 			case DatabaseDefinitionPackage.USER_DEFINED_TYPE_DEFINITION__DISTINCT_TYPE_SUPPORTED:
@@ -298,7 +298,7 @@
 			case DatabaseDefinitionPackage.USER_DEFINED_TYPE_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return maximumIdentifierLength != MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ViewDefinitionImpl.java b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ViewDefinitionImpl.java
index 8f219a1..dda9cd9 100644
--- a/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ViewDefinitionImpl.java
+++ b/plugins/org.eclipse.datatools.modelbase.dbdefinition/src/org/eclipse/datatools/modelbase/dbdefinition/impl/ViewDefinitionImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id$
+ * $Id: ViewDefinitionImpl.java,v 1.1 2006/03/09 23:48:17 dpchou Exp $
  */
 package org.eclipse.datatools.modelbase.dbdefinition.impl;
 
@@ -66,7 +66,7 @@
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
-		return DatabaseDefinitionPackage.eINSTANCE.getViewDefinition();
+		return DatabaseDefinitionPackage.Literals.VIEW_DEFINITION;
 	}
 
 	/**
@@ -95,12 +95,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.VIEW_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return new Integer(getMaximumIdentifierLength());
 		}
-		return eDynamicGet(eFeature, resolve);
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
@@ -108,13 +108,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.VIEW_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				setMaximumIdentifierLength(((Integer)newValue).intValue());
 				return;
 		}
-		eDynamicSet(eFeature, newValue);
+		super.eSet(featureID, newValue);
 	}
 
 	/**
@@ -122,13 +122,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.VIEW_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				setMaximumIdentifierLength(MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT);
 				return;
 		}
-		eDynamicUnset(eFeature);
+		super.eUnset(featureID);
 	}
 
 	/**
@@ -136,12 +136,12 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case DatabaseDefinitionPackage.VIEW_DEFINITION__MAXIMUM_IDENTIFIER_LENGTH:
 				return maximumIdentifierLength != MAXIMUM_IDENTIFIER_LENGTH_EDEFAULT;
 		}
-		return eDynamicIsSet(eFeature);
+		return super.eIsSet(featureID);
 	}
 
 	/**