From dev-return-57079-apmail-ant-dev-archive=ant.apache.org@ant.apache.org Wed Apr 14 20:29:10 2004
Return-Path: <dev-return-57079-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 70157 invoked from network); 14 Apr 2004 20:29:10 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 14 Apr 2004 20:29:10 -0000
Received: (qmail 38934 invoked by uid 500); 14 Apr 2004 20:28:56 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 38888 invoked by uid 500); 14 Apr 2004 20:28:56 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@ant.apache.org>
List-Subscribe: <mailto:dev-subscribe@ant.apache.org>
List-Help: <mailto:dev-help@ant.apache.org>
List-Post: <mailto:dev@ant.apache.org>
List-Id: "Ant Developers List" <dev.ant.apache.org>
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 38874 invoked from network); 14 Apr 2004 20:28:55 -0000
Received: from unknown (HELO central.purematrix.com) (66.180.124.162)
  by daedalus.apache.org with SMTP; 14 Apr 2004 20:28:55 -0000
Received: from purematrix.com (slip-32-102-170-141.co.us.prserv.net [32.102.170.141])
	by central.purematrix.com (Postfix) with SMTP
	id 456843E5E; Wed, 14 Apr 2004 14:28:59 -0600 (MDT)
Sender: jax@purematrix.com
Message-ID: <407D9F05.B03236D7@purematrix.com>
Date: Wed, 14 Apr 2004 14:28:53 -0600
From: "Jack J. Woehr" <jax@purematrix.com>
X-Mailer: Mozilla 4.78 [en] (X11; U; SunOS 5.9 sun4u)
X-Accept-Language: en
MIME-Version: 1.0
To: Ant Developers List <dev@ant.apache.org>
Subject: Sql Task -- A comment and a diff
Content-Type: multipart/mixed;
 boundary="------------DFF98FD37AFDF37763773FD2"
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

--------------DFF98FD37AFDF37763773FD2
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

1. The documentation for the Sql Task is, I believe, inaccurate. It doesn't mention that
the 'keepformat' attribute set to 'true' will eliminate the effect of the REM, // and --
comments.

2. In any case, the attached diff should add the attribute 'commentchars' which allow
the user to choose the single string of characters which constitute a line commenter
when appearing at the head of the line. E.g.,

     <sql commentchars="FOOBAR" ...

will make "FOOBAR" the only string found at the head of a line during processing
which comments out the line.

With this diff,

     if (keepformat == false && (commentchars is_not_set))

then the Sql task will behave as it does currently, removing lines which start with
REM, // or --

I have not fully tested this. If this is interesting to the Ant project, I will procede
to test it (or modify it in light of critique), and subsequently submit a diff which
includes the manual change. It seems a fairly obvious attribute for the Sql task
to present.

--
Jack J. Woehr      # We have gone from the horse and buggy
Senior Consultant  # to the moon rocket in one lifetime, but
Purematrix, Inc.   # there has not been a corresponding moral
www.purematrix.com # growth in mankind. - Dwight D. Eisenhower



--------------DFF98FD37AFDF37763773FD2
Content-Type: text/plain; charset=us-ascii;
 name="sql_diff.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="sql_diff.txt"

Index: src/main/org/apache/tools/ant/taskdefs/SQLExec.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
retrieving revision 1.67
diff -u -r1.67 SQLExec.java
--- src/main/org/apache/tools/ant/taskdefs/SQLExec.java	23 Feb 2004 19:28:23 -0000	1.67
+++ src/main/org/apache/tools/ant/taskdefs/SQLExec.java	14 Apr 2004 20:19:27 -0000
@@ -174,7 +174,14 @@
      * @since Ant 1.6
      */
     private boolean escapeProcessing = true;
-
+    
+    /**
+     * User may chose the line comment characters
+     *
+     * @since Ant 1.7
+     */
+    private String commentChars = null;
+    
     /**
      * Set the name of the SQL file to be run.
      * Required unless statements are enclosed in the build file
@@ -313,6 +320,14 @@
     public void setEscapeProcessing(boolean enable) {
         escapeProcessing = enable;
     }
+    /**
+     * Set line comment chars
+     * @param chars the string the user desires to comment out a line of SQL
+     * @since Ant 1.7
+     */
+    public void setCommentChars(String chars) {
+        commentChars = chars;
+    }
 
     /**
      * Load the sql file and then execute it
@@ -451,16 +466,23 @@
             }
             line = getProject().replaceProperties(line);
             if (!keepformat) {
-                if (line.startsWith("//")) {
-                    continue;
-                }
-                if (line.startsWith("--")) {
-                    continue;
+                if (commentChars == null) {
+                    if (line.startsWith("//")) {
+                        continue;
+                    }
+                    if (line.startsWith("--")) {
+                        continue;
+                    }
+                    StringTokenizer st = new StringTokenizer(line);
+                    if (st.hasMoreTokens()) {
+                        String token = st.nextToken();
+                        if ("REM".equalsIgnoreCase(token)) {
+                            continue;
+                        }
+                    }
                 }
-                StringTokenizer st = new StringTokenizer(line);
-                if (st.hasMoreTokens()) {
-                    String token = st.nextToken();
-                    if ("REM".equalsIgnoreCase(token)) {
+                else{
+                    if (line.startsWith(commentChars)) {
                         continue;
                     }
                 }


--------------DFF98FD37AFDF37763773FD2
Content-Type: text/plain; charset=us-ascii

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
--------------DFF98FD37AFDF37763773FD2--