Thread: [Squirrel-sql-commits] sql12/test/src/net/sourceforge/squirrel_sql/fw/sql OracleQueryTokenizerTest
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Rob M. <man...@us...> - 2007-02-27 01:18:37
|
Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/sql In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22592/test/src/net/sourceforge/squirrel_sql/fw/sql Modified Files: OracleQueryTokenizerTest.java OracleSQL.java Log Message: Fix for issue raised by Anthony Graves regarding anonymous procedure blocks. Index: OracleQueryTokenizerTest.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/sql/OracleQueryTokenizerTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OracleQueryTokenizerTest.java 14 Feb 2007 23:21:28 -0000 1.3 --- OracleQueryTokenizerTest.java 27 Feb 2007 01:18:32 -0000 1.4 *************** *** 8,11 **** --- 8,12 ---- import junit.framework.TestCase; import net.sourceforge.squirrel_sql.client.ApplicationArguments; + import net.sourceforge.squirrel_sql.plugins.oracle.gui.DummyPlugin; import net.sourceforge.squirrel_sql.plugins.oracle.prefs.OraclePreferenceBean; import net.sourceforge.squirrel_sql.plugins.oracle.prefs.PreferencesManager; *************** *** 25,30 **** --- 26,36 ---- static int sqlFileStmtCount = 0; + static OraclePreferenceBean _prefs; + public void setUp() throws Exception { createSQLFile(); + DummyPlugin plugin = new DummyPlugin(); + PreferencesManager.initialize(plugin); + _prefs = PreferencesManager.getPreferences(); } *************** *** 34,38 **** public void testHasQuery() { - OraclePreferenceBean _prefs = PreferencesManager.getPreferences(); qt = new OracleQueryTokenizer(_prefs); qt.setScriptToTokenize(SELECT_DUAL); --- 40,43 ---- *************** *** 45,49 **** public void testGenericSQL() { - OraclePreferenceBean _prefs = PreferencesManager.getPreferences(); String script = SQLUtil.getGenericSQLScript(); qt = new OracleQueryTokenizer(_prefs); --- 50,53 ---- *************** *** 53,57 **** public void testCreateStoredProcedure() { - OraclePreferenceBean _prefs = PreferencesManager.getPreferences(); qt = new OracleQueryTokenizer(_prefs); qt.setScriptToTokenize(CREATE_STORED_PROC); --- 57,60 ---- *************** *** 60,64 **** public void testCreateOrReplaceStoredProcedure() { - OraclePreferenceBean _prefs = PreferencesManager.getPreferences(); qt = new OracleQueryTokenizer(_prefs); qt.setScriptToTokenize(CREATE_OR_REPLACE_STORED_PROC); --- 63,66 ---- *************** *** 67,71 **** public void testHasQueryFromFile() { - OraclePreferenceBean _prefs = PreferencesManager.getPreferences(); String fileSQL = "@" + tmpFilename + ";\n"; qt = new OracleQueryTokenizer(_prefs); --- 69,72 ---- *************** *** 73,76 **** --- 74,83 ---- SQLUtil.checkQueryTokenizer(qt, 6); } + + public void testExecAnonProcedure() { + qt = new OracleQueryTokenizer(_prefs); + qt.setScriptToTokenize(ANON_PROC_EXEC); + SQLUtil.checkQueryTokenizer(qt, 1); + } private static void createSQLFile() throws IOException { *************** *** 89,92 **** --- 96,101 ---- out.println(CREATE_OR_REPLACE_STORED_PROC); out.println(); + out.println(ANON_PROC_EXEC); + out.println(); out.println(SELECT_DUAL); out.println(); *************** *** 99,103 **** // important to set this to the number of statements in the file // above. ! sqlFileStmtCount = 6; } --- 108,112 ---- // important to set this to the number of statements in the file // above. ! sqlFileStmtCount = 7; } Index: OracleSQL.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/sql/OracleSQL.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** OracleSQL.java 4 Feb 2007 02:09:37 -0000 1.4 --- OracleSQL.java 27 Feb 2007 01:18:32 -0000 1.5 *************** *** 33,36 **** --- 33,51 ---- "/ \n\n;"; + public final static String ANON_PROC_EXEC = + "declare \n" + + "v_foo number(10); \n" + + "v_bar number(10); \n" + + "begin \n" + + " for usr in \n" + + " (select * from foo_bar where user like 'TST%') \n" + + " loop \n" + + " begin \n" + + " update STUDENT set AGE = 13 where SNO = 100000; \n" + + " end; \n" + + " end loop; \n" + + "end; \n" + + "/ \n\n"; + public final static String UPDATE_TEST = "update test " + |