[Mulgara-svn] r1890 - in trunk/src/jar/query/java/org/mulgara/query: . operation

[pag at mulgara.org]

Author: pag
Date: 2010-01-27 10:27:39 -0800 (Wed, 27 Jan 2010)
New Revision: 1890

Modified:
   trunk/src/jar/query/java/org/mulgara/query/Query.java
   trunk/src/jar/query/java/org/mulgara/query/operation/Command.java
   trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java
   trunk/src/jar/query/java/org/mulgara/query/operation/LocalCommand.java
   trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java
   trunk/src/jar/query/java/org/mulgara/query/operation/ServerCommand.java
   trunk/src/jar/query/java/org/mulgara/query/operation/TransactionCommand.java
Log:
Fixed TqlAutoInterpreter to correctly deal with all three operations for changing transaction state.

Modified: trunk/src/jar/query/java/org/mulgara/query/Query.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/Query.java	2010-01-19 23:10:29 UTC (rev 1889)
+++ trunk/src/jar/query/java/org/mulgara/query/Query.java	2010-01-27 18:27:39 UTC (rev 1890)
@@ -571,6 +571,15 @@
 
 
   /**
+   * Sets message text relevant to the operation.  Useful for the UI.
+   * @return The set text.
+   */
+  public String setResultMessage(String resultMessage) {
+    return this.resultMessage = resultMessage;
+  }
+
+
+  /**
    * Executes this query on a connection.
    * @param conn The connection to a database session to execute the query against.
    * @return The answer to this query.  This must be closed by the calling code.

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Command.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Command.java	2010-01-19 23:10:29 UTC (rev 1889)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Command.java	2010-01-27 18:27:39 UTC (rev 1890)
@@ -93,4 +93,9 @@
    */
   public String getText();
 
+  /**
+   * Sets message text relevant to the operation.  Useful for the UI.
+   * @return The set text.
+   */
+  String setResultMessage(String resultMessage);
 }

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java	2010-01-19 23:10:29 UTC (rev 1889)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java	2010-01-27 18:27:39 UTC (rev 1890)
@@ -50,7 +50,7 @@
       return setResultMessage("Successfully committed transaction");
     } else {
       assert conn instanceof org.mulgara.connection.DummyConnection;
-      return setResultMessage("Skipped commit for internal connection");
+      return setResultMessage("Successfully committed transaction");
     }
   }
 
@@ -62,12 +62,4 @@
     return true;
   }
 
-
-  /**
-   * Sets message text relevant to the operation.  Exposes this publicly, but only for internal use.
-   * @return The set text.
-   */
-  public String setResultMessage(String resultMessage) {
-    return super.setResultMessage(resultMessage);
-  }
 }

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/LocalCommand.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/LocalCommand.java	2010-01-19 23:10:29 UTC (rev 1889)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/LocalCommand.java	2010-01-27 18:27:39 UTC (rev 1890)
@@ -125,7 +125,7 @@
    * Sets message text relevant to the operation.  Useful for the UI.
    * @return The set text.
    */
-  String setResultMessage(String resultMessage) {
+  public String setResultMessage(String resultMessage) {
     return this.resultMessage = resultMessage;
   }
 }

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java	2010-01-19 23:10:29 UTC (rev 1889)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java	2010-01-27 18:27:39 UTC (rev 1890)
@@ -51,7 +51,8 @@
       return setResultMessage("Successfully rolled back changes");
     } else {
       assert conn instanceof org.mulgara.connection.DummyConnection;
-      return setResultMessage("Skipped rollback for internal connection");
+      conn.setAutoCommit(true);
+      return setResultMessage("Successfully rolled back changes");
     }
   }
 
@@ -63,12 +64,4 @@
     return false;
   }
 
-
-  /**
-   * Sets message text relevant to the operation.  Exposes this publicly, but only for internal use.
-   * @return The set text.
-   */
-  public String setResultMessage(String resultMessage) {
-    return super.setResultMessage(resultMessage);
-  }
 }

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/ServerCommand.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/ServerCommand.java	2010-01-19 23:10:29 UTC (rev 1889)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/ServerCommand.java	2010-01-27 18:27:39 UTC (rev 1890)
@@ -138,7 +138,7 @@
    * Sets message text relevant to the operation.  Useful for the UI.
    * @return The set text.
    */
-  String setResultMessage(String resultMessage) {
+  public String setResultMessage(String resultMessage) {
     return this.resultMessage = resultMessage;
   }
 }

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/TransactionCommand.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/TransactionCommand.java	2010-01-19 23:10:29 UTC (rev 1889)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/TransactionCommand.java	2010-01-27 18:27:39 UTC (rev 1890)
@@ -29,7 +29,7 @@
  * @copyright &copy; 2007 <a href="mailto:pgearon at users.sourceforge.net">Paul Gearon</a>
  * @licence <a href="{@docRoot}/../../LICENCE.txt">Open Software License v3.0</a>
  */
-public abstract class TransactionCommand extends LocalCommand {
+public abstract class TransactionCommand extends LocalCommand implements TxOp {
 
   /**
    * Indicates that the command modifies the state in a transaction.