[Squirrel-sql-commits] sql12/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script CreateDataScriptOfCurrentSQLCommand.java, 1.11, 1.12 CreateTableOfCurrentSQLCommand.java, 1.10, 1.11 CreateDataScriptCommand.java, 1.24, 1.25

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7188/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script

Modified Files:
	CreateDataScriptOfCurrentSQLCommand.java 
	CreateTableOfCurrentSQLCommand.java 
	CreateDataScriptCommand.java 
Log Message:
Added tests and fixed warnings identified by Eclipse and findbugs.

Index: CreateDataScriptOfCurrentSQLCommand.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptOfCurrentSQLCommand.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CreateDataScriptOfCurrentSQLCommand.java	9 Jun 2007 12:56:33 -0000	1.11
--- CreateDataScriptOfCurrentSQLCommand.java	27 Dec 2008 19:30:19 -0000	1.12
***************
*** 30,33 ****
--- 30,34 ----
  import net.sourceforge.squirrel_sql.fw.sql.IQueryTokenizer;
  import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
+ import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
  import net.sourceforge.squirrel_sql.fw.util.StringManager;
  import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
***************
*** 109,119 ****
                 finally
                 {
!                   try
!                   {
!                      stmt.close();
!                   }
!                   catch (Exception e)
!                   {
!                   }
                 }
              }
--- 110,114 ----
                 finally
                 {
!                	SQLUtilities.closeStatement(stmt);
                 }
              }

Index: CreateDataScriptCommand.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CreateDataScriptCommand.java	20 Jul 2008 21:07:58 -0000	1.24
--- CreateDataScriptCommand.java	27 Dec 2008 19:30:19 -0000	1.25
***************
*** 43,46 ****
--- 43,47 ----
  import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
  import net.sourceforge.squirrel_sql.fw.sql.JDBCTypeMapper;
+ import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
  import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
  import net.sourceforge.squirrel_sql.fw.util.ICommand;
***************
*** 171,181 ****
                 finally
                 {
!                   try
!                   {
!                      stmt.close();
!                   }
!                   catch (Exception e)
!                   {
!                   }
                 }
              }
--- 172,176 ----
                 finally
                 {
!                	SQLUtilities.closeStatement(stmt);
                 }
              }

Index: CreateTableOfCurrentSQLCommand.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLCommand.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CreateTableOfCurrentSQLCommand.java	11 Sep 2008 00:37:15 -0000	1.10
--- CreateTableOfCurrentSQLCommand.java	27 Dec 2008 19:30:19 -0000	1.11
***************
*** 34,37 ****
--- 34,38 ----
  import net.sourceforge.squirrel_sql.fw.sql.IQueryTokenizer;
  import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
+ import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
  import net.sourceforge.squirrel_sql.fw.util.StringManager;
  import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
***************
*** 143,147 ****
           finally
           {
!             try {stmt.close();} catch (Exception e) {}
           }
  
--- 144,148 ----
           finally
           {
!             SQLUtilities.closeStatement(stmt);
           }
  
***************
*** 228,277 ****
     }
  
-    private String getTableName()
-    {
-       return "ygwaTest";
-    }
- 
-    private String getNextToken(String selectSQL, int startPos)
-    {
-       int curPos = startPos;
-       while(curPos < selectSQL.length() && true == Character.isWhitespace(selectSQL.charAt(curPos)))
-       {
-          // Move over leading whitespaces
-          ++curPos;
-       }
- 
-       int startPosTrimed = curPos;
- 
- 
-       while(curPos < selectSQL.length() && false == Character.isWhitespace(selectSQL.charAt(curPos)))
-       {
-          ++curPos;
-       }
- 
-       return selectSQL.substring(startPosTrimed, curPos);
-    }
- 
-    private int getTokenBeginIndex(String selectSQL, String token)
-    {
-       String lowerSel = selectSQL.toLowerCase();
-       String lowerToken = token.toLowerCase().trim();
- 
-       int curPos = 0;
-       while(-1 != curPos)
-       {
-          curPos = lowerSel.indexOf(lowerToken);
- 
-          if(
-                 -1 < curPos
-              && (0 == curPos || Character.isWhitespace(lowerSel.charAt(curPos-1)))
-              && (lowerSel.length() == curPos + lowerToken.length() || Character.isWhitespace(lowerSel.charAt(curPos + lowerToken.length())))
-            )
-          {
-             return curPos;
-          }
-       }
- 
-       return curPos;
-    }
  }
\ No newline at end of file
--- 229,231 ----