Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 75004 invoked from network); 12 Mar 2006 22:28:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Mar 2006 22:28:18 -0000 Received: (qmail 11822 invoked by uid 500); 12 Mar 2006 22:28:18 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 11791 invoked by uid 500); 12 Mar 2006 22:28:17 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 11780 invoked by uid 99); 12 Mar 2006 22:28:17 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Mar 2006 14:28:17 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 12 Mar 2006 14:28:17 -0800 Received: (qmail 74933 invoked by uid 65534); 12 Mar 2006 22:27:56 -0000 Message-ID: <20060312222756.74932.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r385377 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Triggers.java Date: Sun, 12 Mar 2006 22:27:56 -0000 To: derby-commits@db.apache.org From: djd@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djd Date: Sun Mar 12 14:27:55 2006 New Revision: 385377 URL: http://svn.apache.org/viewcvs?rev=385377&view=rev Log: DERBY-1102 (partial) Remove application code that printed the trigger information using non-public apis. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Triggers.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Triggers.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Triggers.java?rev=385377&r1=385376&r2=385377&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Triggers.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Triggers.java Sun Mar 12 14:27:55 2006 @@ -40,7 +40,6 @@ public static String triggerFiresMinimal(String string) throws Throwable { - TriggerExecutionContext tec = Factory.getTriggerExecutionContext(); System.out.println("TRIGGER: " + "<"+string+">"); return ""; } @@ -154,91 +153,6 @@ "TARGET: workUnitFires" : isReplicationSource() ? "SOURCE: workUnitFires" : "")); - } - - public static String printTriggerInfo() throws Throwable - { - TriggerExecutionContext tec = Factory.getTriggerExecutionContext(); - int eventType = tec.getEventType(); - String eventName; - - switch (eventType) - { - case TriggerExecutionContext.UPDATE_EVENT: - eventName = "UPDATE"; - break; - - case TriggerExecutionContext.DELETE_EVENT: - eventName = "DELETE"; - break; - - case TriggerExecutionContext.INSERT_EVENT: - eventName = "INSERT"; - break; - default: - throw new Throwable("unexpected event type: "+eventType); - } - - StringBuffer strbuf = new StringBuffer("TriggerInformation\n------------------\n"); - strbuf.append("getEventStatetmentText(): "+tec.getEventStatementText()); - strbuf.append("\ngetEventType(): "+eventName); - strbuf.append("\ngetModifiedColumns(): {"); - - String[] modifiedCols = tec.getModifiedColumns(); - if (modifiedCols == null) - { - strbuf.append(" }"); - } - else - { - for (int i = 0; i < modifiedCols.length; i++) - { - if (i > 0) - strbuf.append(", "); - strbuf.append(modifiedCols[i]); - } - strbuf.append("}"); - } - strbuf.append("\n"); - strbuf.append(getModifiedColumnsCheckInfo(tec)); - System.out.println(strbuf.toString()); - printTriggerChanges(); - return ""; - } - - private static String getModifiedColumnsCheckInfo(TriggerExecutionContext tec) throws Throwable - { - ResultSet rs = (tec.getNewRowSet() == null) ? - tec.getOldRowSet() : - tec.getNewRowSet(); - - ResultSetMetaData rsmd = rs.getMetaData(); - - // Get the number of columns in the result set - int numCols = rsmd.getColumnCount(); - - StringBuffer msg = new StringBuffer("wasColumnModified() on each column\n\t"); - for (int i=1; i<=numCols; i++) - { - if (i > 1) - { - msg.append("\n\t"); - } - msg.append(rsmd.getColumnLabel(i)); - msg.append(":\t"); - boolean wasModified = tec.wasColumnModified(rsmd.getColumnLabel(i)); - if (wasModified != tec.wasColumnModified(i)) - { - msg.append("ERROR: tec.wasColumnModifed(String) = "+wasModified); - msg.append("and tec.wasColumnModifed(int) = "+(!wasModified)); - } - else - { - msg.append(wasModified); - } - } - msg.append("\n"); - return msg.toString(); } // used for performance numbers