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

Timestamp:

02/04/10 21:57:54 (2 years ago)

Author:

kasper

Message:

 

File:

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

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

@@ -430 +430 @@
         }
 
-        public DataSet executeQuery(Query query) throws MetaModelException {
+        public DataSet executeQuery(Query query) throws MetadataBeansException {
                 Statement statement = null;
                 ResultSet resultSet = null;
@@ -484 +484 @@
                                 return failoverStrategy.executeQuery(query);
                         } else {
-                                throw new MetaModelException("Could not execute query", e);
+                                throw new MetadataBeansException("Could not execute query", e);
                         }
                 }
@@ -551 +551 @@
                                 } catch (SQLException e) {
                                         close(resultSet, statement);
-                                        throw new MetaModelException(e);
+                                        throw new MetadataBeansException(e);
                                 }
                         }
 
                         @Override
-                        protected MutableSchema getMainSchema() throws MetaModelException {
+                        protected MutableSchema getMainSchema() throws MetadataBeansException {
                                 return JdbcDataContextStrategy.this
                                                 .getSchemaByName(getMainSchemaName());
@@ -562 +562 @@
 
                         @Override
-                        protected String getMainSchemaName() throws MetaModelException {
+                        protected String getMainSchemaName() throws MetadataBeansException {
                                 return JdbcDataContextStrategy.this.getDefaultSchemaName();
                         }
@@ -606 +606 @@
                 } catch (SQLException e) {
                         _log.error("Error retrieving metadata", e);
-                        throw new MetaModelException(e);
+                        throw new MetadataBeansException(e);
                 }
 
@@ -639 +639 @@
                         return _dataSource.getConnection();
                 } catch (SQLException e) {
-                        throw new MetaModelException("Could not establish connection", e);
+                        throw new MetadataBeansException("Could not establish connection", e);
                 }
         }
@@ -735 +735 @@
         }
 
-        public MutableSchema getSchemaByName(String name) throws MetaModelException {
+        public MutableSchema getSchemaByName(String name) throws MetadataBeansException {
                 DatabaseMetaData metaData;
                 try {
                         metaData = getConnection().getMetaData();
                 } catch (SQLException e) {
-                        throw new MetaModelException(e);
+                        throw new MetadataBeansException(e);
                 }
                 JdbcSchema schema = new JdbcSchema(name, this);
@@ -751 +751 @@
         }
 
-        public String[] getSchemaNames() throws MetaModelException {
+        public String[] getSchemaNames() throws MetadataBeansException {
                 try {
                         DatabaseMetaData metaData = getConnection().getMetaData();
@@ -786 +786 @@
                         return result.toArray(new String[result.size()]);
                 } catch (SQLException e) {
-                        throw new MetaModelException(e);
+                        throw new MetadataBeansException(e);
                 }
         }