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

Timestamp:

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

Author:

kasper

Message:

 

File:

• MetadataBeans/trunk/src/main/java/org/eobjects/metamodel/QueryPostprocessDataContextStrategy.java (modified) (11 diffs)

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

@@ -110 +110 @@
                                 DataSet dataSet = materializeTable(table, columns, query
                                                 .getMaxRows());
-                                dataSet = MetaModelHelper.getSelection(selectItems, dataSet);
+                                dataSet = MetadataBeansHelper.getSelection(selectItems, dataSet);
                                 return dataSet;
                         }
@@ -128 +128 @@
 
                 // Execute the query using the raw data
-                DataSet dataSet = MetaModelHelper.getCarthesianProduct(fromDataSets,
+                DataSet dataSet = MetadataBeansHelper.getCarthesianProduct(fromDataSets,
                                 whereItems);
                 if (groupByItems.size() > 0) {
-                        dataSet = MetaModelHelper.getGrouped(workSelectItems, dataSet,
+                        dataSet = MetadataBeansHelper.getGrouped(workSelectItems, dataSet,
                                         groupByItems);
                 } else {
-                        dataSet = MetaModelHelper.getAggregated(workSelectItems, dataSet);
-                }
-                dataSet = MetaModelHelper.getFiltered(dataSet, havingItems);
+                        dataSet = MetadataBeansHelper.getAggregated(workSelectItems, dataSet);
+                }
+                dataSet = MetadataBeansHelper.getFiltered(dataSet, havingItems);
 
                 if (query.getSelectClause().isDistinct()) {
-                        dataSet = MetaModelHelper.getSelection(selectItems, dataSet);
-                        dataSet = MetaModelHelper.getDistinct(dataSet);
-                        dataSet = MetaModelHelper.getOrdered(dataSet, orderByItems);
+                        dataSet = MetadataBeansHelper.getSelection(selectItems, dataSet);
+                        dataSet = MetadataBeansHelper.getDistinct(dataSet);
+                        dataSet = MetadataBeansHelper.getOrdered(dataSet, orderByItems);
                 } else {
-                        dataSet = MetaModelHelper.getOrdered(dataSet, orderByItems);
-                        dataSet = MetaModelHelper.getSelection(selectItems, dataSet);
+                        dataSet = MetadataBeansHelper.getOrdered(dataSet, orderByItems);
+                        dataSet = MetadataBeansHelper.getSelection(selectItems, dataSet);
                 }
 
@@ -160 +160 @@
         public QueryPostprocessDataContextStrategy transformColumnTypes(
                         Column... columns) {
-                Table[] tables = MetaModelHelper.getTables(columns);
+                Table[] tables = MetadataBeansHelper.getTables(columns);
                 for (Table table : tables) {
-                        Column[] columnsToQuery = MetaModelHelper.getTableColumns(table,
+                        Column[] columnsToQuery = MetadataBeansHelper.getTableColumns(table,
                                         columns);
-                        columnsToQuery = MetaModelHelper.getColumnsByType(columnsToQuery,
+                        columnsToQuery = MetadataBeansHelper.getColumnsByType(columnsToQuery,
                                         ColumnType.VARCHAR);
                         DataSet dataSet = executeQuery(new Query().select(columnsToQuery)
@@ -264 +264 @@
                         }
                         if (joinType == JoinType.INNER) {
-                                dataSet = MetaModelHelper.getCarthesianProduct(
+                                dataSet = MetadataBeansHelper.getCarthesianProduct(
                                                 fromItemDataSets, onConditions);
                         } else if (joinType == JoinType.LEFT) {
-                                dataSet = MetaModelHelper.getLeftJoin(fromItemDataSets[0],
+                                dataSet = MetadataBeansHelper.getLeftJoin(fromItemDataSets[0],
                                                 fromItemDataSets[1], onConditions);
                         } else if (joinType == JoinType.RIGHT) {
-                                dataSet = MetaModelHelper.getRightJoin(fromItemDataSets[0],
+                                dataSet = MetadataBeansHelper.getRightJoin(fromItemDataSets[0],
                                                 fromItemDataSets[1], onConditions);
                         } else {
@@ -332 +332 @@
         }
 
-        public String[] getSchemaNames() throws MetaModelException {
+        public String[] getSchemaNames() throws MetadataBeansException {
                 if (_schemaNames == null) {
                         _schemaNames = new String[2];
@@ -341 +341 @@
         }
 
-        public String getDefaultSchemaName() throws MetaModelException {
+        public String getDefaultSchemaName() throws MetadataBeansException {
                 return getSchemaNames()[1];
         }
 
-        public Schema getSchemaByName(String name) throws MetaModelException {
+        public Schema getSchemaByName(String name) throws MetadataBeansException {
                 if (name != null) {
                         if (name.equals(getSchemaNames()[1])) {
@@ -438 +438 @@
                         }
 
-                        dataSet = new DataSet(MetaModelHelper.createSelectItems(table
+                        dataSet = new DataSet(MetadataBeansHelper.createSelectItems(table
                                         .getColumns()), data);
                 } else if ("columns".equals(tableName)) {
@@ -456 +456 @@
                                 }
                         }
-                        dataSet = new DataSet(MetaModelHelper.createSelectItems(table
+                        dataSet = new DataSet(MetadataBeansHelper.createSelectItems(table
                                         .getColumns()), data);
                 } else if ("relationships".equals(tableName)) {
@@ -475 +475 @@
                                 }
                         }
-                        dataSet = new DataSet(MetaModelHelper.createSelectItems(table
+                        dataSet = new DataSet(MetadataBeansHelper.createSelectItems(table
                                         .getColumns()), data);
                 } else {
@@ -483 +483 @@
 
                 // Handle column subset
-                dataSet = MetaModelHelper.getSelection(MetaModelHelper
+                dataSet = MetadataBeansHelper.getSelection(MetadataBeansHelper
                                 .createSelectItems(columns), dataSet);
 
@@ -504 +504 @@
          * @return the main schema that subclasses of this class produce
          */
-        protected abstract Schema getMainSchema() throws MetaModelException;
+        protected abstract Schema getMainSchema() throws MetadataBeansException;
 
         /**
          * @return the name of the main schema that subclasses of this class produce
          */
-        protected abstract String getMainSchemaName() throws MetaModelException;
+        protected abstract String getMainSchemaName() throws MetadataBeansException;
 
         /**