Changeset 887 for MetadataBeans/trunk/src/main/java/org/eobjects/metamodel/JdbcDataContextStrategy.java

Timestamp:

02/04/10 21:56:24 (2 years ago)

Author:

kasper

Message:

 

File:

• MetadataBeans/trunk/src/main/java/org/eobjects/metamodel/JdbcDataContextStrategy.java (modified) (6 diffs)

MetadataBeans/trunk/src/main/java/org/eobjects/metamodel/JdbcDataContextStrategy.java

@@ -48 +48 @@
 import org.eobjects.metamodel.schema.JdbcSchema;
 import org.eobjects.metamodel.schema.JdbcTable;
+import org.eobjects.metamodel.schema.MutableColumn;
+import org.eobjects.metamodel.schema.ImmutableRelationship;
+import org.eobjects.metamodel.schema.MutableSchema;
 import org.eobjects.metamodel.schema.Relationship;
 import org.eobjects.metamodel.schema.Schema;
 import org.eobjects.metamodel.schema.Table;
 import org.eobjects.metamodel.schema.TableType;
-
 
 /**
@@ -252 +254 @@
                                 if (columnName != null) {
                                         Column column = table.getColumnByName(columnName);
-                                        if (column != null) {
-                                                column.setIndexed(true);
+                                        if (column != null && column instanceof MutableColumn) {
+                                                ((MutableColumn) column).setIndexed(true);
                                         } else {
                                                 _log.error("Indexed column \"" + columnName
@@ -328 +330 @@
                                 String remarks = rs.getString(12);
 
-                                Column column = new JdbcColumn(columnName, columnType, table,
-                                                columnNumber, nullable);
+                                MutableColumn column = new JdbcColumn(columnName, columnType,
+                                                table, columnNumber, nullable);
                                 column.setRemarks(remarks);
                                 column.setNativeType(nativeType);
@@ -420 +422 @@
                                 }
                                 if (!exists) {
-                                        Relationship.createRelationship(new Column[] { pkColumn },
+                                        ImmutableRelationship.createRelationship(
+                                                        new Column[] { pkColumn },
                                                         new Column[] { fkColumn });
                                 }
@@ -553 +556 @@
 
                         @Override
-                        protected Schema getMainSchema() throws MetaModelException {
+                        protected MutableSchema getMainSchema() throws MetaModelException {
                                 return JdbcDataContextStrategy.this
                                                 .getSchemaByName(getMainSchemaName());
@@ -732 +735 @@
         }
 
-        public Schema getSchemaByName(String name) throws MetaModelException {
+        public MutableSchema getSchemaByName(String name) throws MetaModelException {
                 DatabaseMetaData metaData;
                 try {