Author: rareddy Date: 2011-04-04 12:06:49 -0400 (Mon, 04 Apr 2011) New Revision: 3054 Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java Log: TEIID-1515: bring the changes forward from 7.1.1 Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2011-04-04 16:05:27 UTC (rev 3053) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2011-04-04 16:06:49 UTC (rev 3054) @@ -150,7 +150,7 @@ CompositeMetadataStore metadata = vdb.getAttachment(TransformationMetadata.class).getMetadataStore(); TransformationMetadata indexMetadata = vdb.getAttachment(TransformationMetadata.class); Collection rows = new ArrayList(); - int oid = 0; + int oid = 1; if (command instanceof Query) { Query query = (Query)command; UnaryFromClause ufc = (UnaryFromClause)query.getFrom().getClauses().get(0); Modified: trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2011-04-04 16:05:27 UTC (rev 3053) +++ trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2011-04-04 16:06:49 UTC (rev 3054) @@ -615,7 +615,8 @@ private final class QueryWorkItem implements Runnable { private final ScriptReader reader; - String s; + String modfiedSQL; + String sql; private QueryWorkItem(String query) { this.reader = new ScriptReader(new StringReader(query)); @@ -624,25 +625,27 @@ @Override public void run() { try { - if (s == null) { - s = fixSQL(reader.readStatement()); + if (modfiedSQL == null) { + sql = reader.readStatement(); + modfiedSQL = fixSQL(sql); } - while (s != null) { + while (modfiedSQL != null) { try { final StatementImpl stmt = connection.createStatement(); - executionFuture = stmt.submitExecute(s); + executionFuture = stmt.submitExecute(modfiedSQL); executionFuture.addCompletionListener(new ResultsFuture.CompletionListener<Boolean>() { @Override public void onCompletion(ResultsFuture<Boolean> future) { executionFuture = null; try { if (future.get()) { - client.sendResults(s, stmt.getResultSet(), true); + client.sendResults(sql, stmt.getResultSet(), true); } else { - client.sendUpdateCount(s, stmt.getUpdateCount()); + client.sendUpdateCount(sql, stmt.getUpdateCount()); setEncoding(); } - s = fixSQL(reader.readStatement()); + sql = reader.readStatement(); + modfiedSQL = fixSQL(sql); } catch (Throwable e) { client.errorOccurred(e); sync(); Modified: trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2011-04-04 16:05:27 UTC (rev 3053) +++ trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2011-04-04 16:06:49 UTC (rev 3054) @@ -417,6 +417,10 @@ tag = "SELECT"; } else if (sql.startsWith("BEGIN")) { tag = "BEGIN"; + } else if (sql.startsWith("COMMIT")) { + tag = "COMMIT"; + } else if (sql.startsWith("ROLLBACK")) { + tag = "ROLLBACK"; } else { trace("Check command tag:", sql); tag = "UPDATE " + updateCount;