You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2001/12/03 19:23:18 UTC

cvs commit: jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/test Tester.java

hammant     01/12/03 10:23:18

  Modified:    apps/db/src/java/org/apache/avalon/db/test Tester.java
  Log:
  Tester trims whitespace correctly now.
  
  Revision  Changes    Path
  1.37      +14 -13    jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/test/Tester.java
  
  Index: Tester.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/test/Tester.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Tester.java	2001/11/30 10:08:10	1.36
  +++ Tester.java	2001/12/03 18:23:18	1.37
  @@ -20,7 +20,7 @@
   public class Tester {
   
       Connection mCon;
  -    String mLxsql;
  +    String mSQL;
   
       private Tester(String type, String scriptFile) throws Exception {
           Class.forName("org.apache.avalon.db.driver.AvalonDBDriver").newInstance();
  @@ -41,28 +41,29 @@
           isr.close();
           fis.close();
   
  -        mLxsql = buffer.toString();
  +        mSQL = buffer.toString();
   
       }
   
       private void test() throws Exception {
   
  -        String lxSQL = null;
  +        String sql = null;
   
           try {
   
           System.out.println("Testing.....");
   
  -        int str = mLxsql.indexOf("###",0);
  -        int end = mLxsql.indexOf("###",str+3);
  +        int str = mSQL.indexOf("###",0);
  +        int end = mSQL.indexOf("###",str+3);
           while (end > 0) {
  -            int msgEnd = mLxsql.indexOf("##!",str);
  -            System.out.println(mLxsql.substring(str+3, msgEnd));
  -            lxSQL = mLxsql.substring(msgEnd+3,end);
  +            int msgEnd = mSQL.indexOf("##!",str);
  +            System.out.println(mSQL.substring(str+3, msgEnd));
  +            sql = mSQL.substring(msgEnd+3,end).trim();
               Statement st = mCon.createStatement();
   
  -            if (lxSQL.indexOf("<simple-select") > 0 | lxSQL.startsWith("SELECT")) {
  -                ResultSet rs = st.executeQuery(lxSQL.trim());
  +            System.out.println("[[[[" + sql);
  +            if (sql.indexOf("<simple-select") > 0 | sql.startsWith("SELECT")) {
  +                ResultSet rs = st.executeQuery(sql);
                   System.out.println("Results:");
                   while (rs.next()) {
                       System.out.print("  Row:" + rs.getString(0));
  @@ -82,16 +83,16 @@
                   }
                   rs.close();
               } else {
  -                st.executeUpdate(lxSQL.trim());
  +                st.executeUpdate(sql.trim());
               }
               st.close();
               str = end;
  -            end = mLxsql.indexOf("###",end+3);
  +            end = mSQL.indexOf("###",end+3);
           }
   
           } catch (SQLException sqle) {
               System.err.println("-- Failing LXSQL --");
  -            System.err.println(lxSQL);
  +            System.err.println(sql);
               System.err.println("-- Message       --");
               System.err.println(sqle.getMessage());
               System.err.println("-------------------");
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>