[teiid-commits] teiid SVN: r1629 - in trunk/common-internal/src: test/java/com/metamatrix/vdb/edit/materialization and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2009-12-09 15:52:08 -0500 (Wed, 09 Dec 2009)
New Revision: 1629

Modified:
   trunk/common-internal/src/main/resources/com/metamatrix/vdb/materialization/template/scriptMaterializedView.stg
   trunk/common-internal/src/test/java/com/metamatrix/vdb/edit/materialization/TestMaterializedViewScriptGenerator.java
   trunk/common-internal/src/test/resources/materializedView/expected/Load_MatviewVDB.ddl
   trunk/common-internal/src/test/resources/materializedView/expected/MatviewTheFirst_1_Load.ddl
   trunk/common-internal/src/test/resources/materializedView/expected/MetaMatrix_load.txt
Log:
TEIID-900 updating the matview script generation to specify the the no cache group

Modified: trunk/common-internal/src/main/resources/com/metamatrix/vdb/materialization/template/scriptMaterializedView.stg
===================================================================
--- trunk/common-internal/src/main/resources/com/metamatrix/vdb/materialization/template/scriptMaterializedView.stg	2009-12-09 20:17:56 UTC (rev 1628)
+++ trunk/common-internal/src/main/resources/com/metamatrix/vdb/materialization/template/scriptMaterializedView.stg	2009-12-09 20:52:08 UTC (rev 1629)
@@ -50,7 +50,7 @@
 temp( it ) ::= "$it$_TEMP"
 
 populateLoad() ::= <<
-SELECT $columnNames; separator=", "$ INTO $materializationStageTableName$ FROM $virtualGroupName$ OPTION NOCACHE;>>
+SELECT $columnNames; separator=", "$ INTO $materializationStageTableName$ FROM $virtualGroupName$ OPTION NOCACHE $virtualGroupName$;>>
 
 renameTables() ::= <<
 $rename(old=materializationTableNameInSrc, new=materializationTableNameInSrc:temp())$

Modified: trunk/common-internal/src/test/java/com/metamatrix/vdb/edit/materialization/TestMaterializedViewScriptGenerator.java
===================================================================
--- trunk/common-internal/src/test/java/com/metamatrix/vdb/edit/materialization/TestMaterializedViewScriptGenerator.java	2009-12-09 20:17:56 UTC (rev 1628)
+++ trunk/common-internal/src/test/java/com/metamatrix/vdb/edit/materialization/TestMaterializedViewScriptGenerator.java	2009-12-09 20:52:08 UTC (rev 1629)
@@ -39,7 +39,6 @@
 import junit.framework.TestCase;
 
 import com.metamatrix.core.util.FileUtil;
-import com.metamatrix.core.util.StringUtilities;
 import com.metamatrix.core.util.UnitTestUtil;
 import com.metamatrix.vdb.materialization.DatabaseDialect;
 import com.metamatrix.vdb.materialization.MaterializedViewScriptGenerator;

Modified: trunk/common-internal/src/test/resources/materializedView/expected/Load_MatviewVDB.ddl
===================================================================
--- trunk/common-internal/src/test/resources/materializedView/expected/Load_MatviewVDB.ddl	2009-12-09 20:17:56 UTC (rev 1628)
+++ trunk/common-internal/src/test/resources/materializedView/expected/Load_MatviewVDB.ddl	2009-12-09 20:52:08 UTC (rev 1629)
@@ -1,2 +1,2 @@
 -- MetaMatrix script. Populate MatviewVDB cache table.
-SELECT col_1, col_2, col_3, col_4, col_5 INTO A_physical_staging_table FROM A_virtual_table OPTION NOCACHE;
+SELECT col_1, col_2, col_3, col_4, col_5 INTO A_physical_staging_table FROM A_virtual_table OPTION NOCACHE A_virtual_table;

Modified: trunk/common-internal/src/test/resources/materializedView/expected/MatviewTheFirst_1_Load.ddl
===================================================================
--- trunk/common-internal/src/test/resources/materializedView/expected/MatviewTheFirst_1_Load.ddl	2009-12-09 20:17:56 UTC (rev 1628)
+++ trunk/common-internal/src/test/resources/materializedView/expected/MatviewTheFirst_1_Load.ddl	2009-12-09 20:52:08 UTC (rev 1629)
@@ -1,2 +1,2 @@
 -- MetaMatrix script. Populate MatviewTheFirst cache table.
-SELECT col_1, col_2, col_3, col_4, col_5 INTO A_physical_staging_table FROM A_virtual_table OPTION NOCACHE;
+SELECT col_1, col_2, col_3, col_4, col_5 INTO A_physical_staging_table FROM A_virtual_table OPTION NOCACHE A_virtual_table;

Modified: trunk/common-internal/src/test/resources/materializedView/expected/MetaMatrix_load.txt
===================================================================
--- trunk/common-internal/src/test/resources/materializedView/expected/MetaMatrix_load.txt	2009-12-09 20:17:56 UTC (rev 1628)
+++ trunk/common-internal/src/test/resources/materializedView/expected/MetaMatrix_load.txt	2009-12-09 20:52:08 UTC (rev 1629)
@@ -1,2 +1,2 @@
 -- MetaMatrix script. Populate view1 cache table.
-SELECT column1, column2, column3 INTO materializationStageTableName FROM virtualGroupName OPTION NOCACHE;
+SELECT column1, column2, column3 INTO materializationStageTableName FROM virtualGroupName OPTION NOCACHE virtualGroupName;