Author: shawkins Date: 2011-05-24 09:48:27 -0400 (Tue, 24 May 2011) New Revision: 3192 Modified: branches/7.4.x/engine/src/main/resources/org/teiid/query/i18n.properties branches/7.4.x/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolving.java branches/7.4.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java Log: TEIID-1597 minor update to the exception message to cover both tables and procedures Modified: branches/7.4.x/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- branches/7.4.x/engine/src/main/resources/org/teiid/query/i18n.properties 2011-05-24 02:00:12 UTC (rev 3191) +++ branches/7.4.x/engine/src/main/resources/org/teiid/query/i18n.properties 2011-05-24 13:48:27 UTC (rev 3192) @@ -697,7 +697,7 @@ XMLQueryResolver.xml_only_valid_alone=If any symbol in SELECT clause is ''xml'' or group.''xml'' , then no other element is allowed. ResolveVariablesVisitor.datatype_for_the_expression_not_resolvable=The datatype for the expression was not resolvable. TempTableResolver.unqualified_name_required=Cannot create temporary table "{0}". Local temporary tables must be created with unqualified names. -TempTableResolver.table_already_exists=Cannot create temporary table "{0}". A schema entry with the same name already exists. +TempTableResolver.table_already_exists=Cannot create temporary table "{0}". An object with the same name already exists. ValidationVisitor.drop_of_nontemptable=Cannot drop a non temporary table "{0}". ValidationVisitor.orderby_expression_xml=XML queries cannot order by an expression. ValidationVisitor.text_table_invalid_width=For a fixed width text table, all columns must have width set. Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolving.java =================================================================== --- branches/7.4.x/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolving.java 2011-05-24 02:00:12 UTC (rev 3191) +++ branches/7.4.x/engine/src/test/java/org/teiid/query/resolver/TestProcedureResolving.java 2011-05-24 13:48:27 UTC (rev 3192) @@ -1389,7 +1389,7 @@ String userUpdateStr = "UPDATE vm1.g1 SET e1='x'"; //$NON-NLS-1$ - helpFailUpdateProcedure(proc.toString(), userUpdateStr, Table.TriggerEvent.UPDATE, "Cannot create temporary table \"loopCursor\". A table with the same name already exists."); //$NON-NLS-1$ + helpFailUpdateProcedure(proc.toString(), userUpdateStr, Table.TriggerEvent.UPDATE, "Cannot create temporary table \"loopCursor\". An object with the same name already exists."); //$NON-NLS-1$ } @Test public void testProcedureCreateDrop() { Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java =================================================================== --- branches/7.4.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2011-05-24 02:00:12 UTC (rev 3191) +++ branches/7.4.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2011-05-24 13:48:27 UTC (rev 3192) @@ -2352,7 +2352,7 @@ @Test public void testCreateAlreadyExists() { String sql = "CREATE LOCAL TEMPORARY TABLE g1 (column1 string)"; //$NON-NLS-1$ - helpResolveException(sql, "Cannot create temporary table \"g1\". A table with the same name already exists."); //$NON-NLS-1$ + helpResolveException(sql, "Cannot create temporary table \"g1\". An object with the same name already exists."); //$NON-NLS-1$ } @Test public void testCreateImplicitName() { @@ -2362,7 +2362,7 @@ } @Test public void testCreateInProc() throws Exception{ - helpResolveException("CREATE VIRTUAL PROCEDURE BEGIN create local temporary table g1(c1 string); end", "Cannot create temporary table \"g1\". A table with the same name already exists.");//$NON-NLS-1$ //$NON-NLS-2$ + helpResolveException("CREATE VIRTUAL PROCEDURE BEGIN create local temporary table g1(c1 string); end", "Cannot create temporary table \"g1\". An object with the same name already exists.");//$NON-NLS-1$ //$NON-NLS-2$ } //this was the old virt.agg procedure. It was defined in such a way that relied on the scope leak of #temp