You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(121) |
May
(188) |
Jun
(134) |
Jul
(115) |
Aug
(201) |
Sep
(22) |
Oct
(22) |
Nov
(15) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(4) |
Mar
(1) |
Apr
(84) |
May
(107) |
Jun
(101) |
Jul
(131) |
Aug
(66) |
Sep
(55) |
Oct
(189) |
Nov
(164) |
Dec
(60) |
| 2006 |
Jan
(75) |
Feb
(107) |
Mar
(117) |
Apr
(115) |
May
(91) |
Jun
(91) |
Jul
(225) |
Aug
(151) |
Sep
(117) |
Oct
(165) |
Nov
(263) |
Dec
(233) |
| 2007 |
Jan
(244) |
Feb
(116) |
Mar
(185) |
Apr
(263) |
May
(149) |
Jun
(292) |
Jul
(260) |
Aug
(306) |
Sep
(130) |
Oct
(61) |
Nov
(103) |
Dec
(144) |
| 2008 |
Jan
(112) |
Feb
(55) |
Mar
(116) |
Apr
(76) |
May
(69) |
Jun
(130) |
Jul
(75) |
Aug
(56) |
Sep
(76) |
Oct
(87) |
Nov
(403) |
Dec
(410) |
| 2009 |
Jan
(132) |
Feb
(168) |
Mar
(197) |
Apr
(67) |
May
(8) |
Jun
(44) |
Jul
(144) |
Aug
(126) |
Sep
(88) |
Oct
(3) |
Nov
(81) |
Dec
(97) |
| 2010 |
Jan
(238) |
Feb
(41) |
Mar
(61) |
Apr
(37) |
May
(31) |
Jun
(22) |
Jul
(92) |
Aug
(105) |
Sep
(46) |
Oct
(45) |
Nov
(55) |
Dec
(92) |
| 2011 |
Jan
(51) |
Feb
(21) |
Mar
(57) |
Apr
(20) |
May
(32) |
Jun
(29) |
Jul
(26) |
Aug
(50) |
Sep
(59) |
Oct
(25) |
Nov
(79) |
Dec
(2) |
| 2012 |
Jan
(14) |
Feb
(31) |
Mar
(11) |
Apr
(9) |
May
(13) |
Jun
(9) |
Jul
(6) |
Aug
(12) |
Sep
(16) |
Oct
(37) |
Nov
(12) |
Dec
(7) |
| 2013 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Rob M. <man...@us...> - 2010-02-07 22:19:50
|
Update of /cvsroot/squirrel-sql/sql12/app/cmd In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20175/app/cmd Modified Files: squirrel-sql.sh Log Message: Removed stray semi-colon. Index: squirrel-sql.sh =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/cmd/squirrel-sql.sh,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** squirrel-sql.sh 7 Feb 2010 22:12:25 -0000 1.25 --- squirrel-sql.sh 7 Feb 2010 22:19:42 -0000 1.26 *************** *** 62,66 **** # Then add all library jars to the classpath. for a in "$UNIX_STYLE_HOME"/lib/*; do ! TMP_CP="$TMP_CP":"$a"; done --- 62,66 ---- # Then add all library jars to the classpath. for a in "$UNIX_STYLE_HOME"/lib/*; do ! TMP_CP="$TMP_CP":"$a" done |
|
From: Rob M. <man...@us...> - 2010-02-07 22:19:50
|
Update of /cvsroot/squirrel-sql/sql12/build/plainzip In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20175/build/plainzip Modified Files: squirrel-sql.sh Log Message: Removed stray semi-colon. Index: squirrel-sql.sh =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/build/plainzip/squirrel-sql.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** squirrel-sql.sh 7 Feb 2010 22:16:37 -0000 1.6 --- squirrel-sql.sh 7 Feb 2010 22:19:42 -0000 1.7 *************** *** 64,68 **** # Then add all library jars to the classpath. for a in "$UNIX_STYLE_HOME"/lib/*; do ! TMP_CP="$TMP_CP":"$a"; done --- 64,68 ---- # Then add all library jars to the classpath. for a in "$UNIX_STYLE_HOME"/lib/*; do ! TMP_CP="$TMP_CP":"$a" done |
|
From: Rob M. <man...@us...> - 2010-02-07 22:16:46
|
Update of /cvsroot/squirrel-sql/sql12/build/plainzip In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19740/build/plainzip Modified Files: squirrel-sql.sh Log Message: Bugfix 2939376: Documented the algorithm for finding the java executable to use and made the logic less terse/confusing. Merged the case statements into one case statement. Index: squirrel-sql.sh =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/build/plainzip/squirrel-sql.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** squirrel-sql.sh 4 Aug 2009 11:05:23 -0000 1.5 --- squirrel-sql.sh 7 Feb 2010 22:16:37 -0000 1.6 *************** *** 1,14 **** ! `#! /bin/sh ! [ ${JAVA_HOME} ] && JAVA=${JAVA_HOME}/bin/java || JAVA=java ! # Are we running within Cygwin on some version of Windows? cygwin=false; macosx=false; - - case "`uname -s`" in - CYGWIN*) cygwin=true ;; - esac case "`uname -s`" in ! Darwin) macosx=true;; esac --- 1,31 ---- ! #! /bin/sh ! # IZPACK_JAVA_HOME is filtered in by the IzPack installer when this script is installed ! IZPACK_JAVA_HOME=%JAVA_HOME ! ! # We detect the java executable to use according to the following algorithm: ! # ! # 1. If it is located in JAVA_HOME, then we use that; or ! # 2. If the one used by the IzPack installer is available then use that, otherwise ! # 3. Use the java that is in the command path. ! # ! if [ -d "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then ! JAVACMD="$JAVA_HOME/bin/java" ! elif [ -d "$IZPACK_JAVA_HOME" -a -x "$IZPACK_JAVA_HOME/bin/java" ]; then ! JAVACMD="$IZPACK_JAVA_HOME/bin/java" ! else ! JAVACMD=java ! fi ! ! # Are we running within Cygwin on some version of Windows or on Mac OS X? cygwin=false; macosx=false; case "`uname -s`" in ! CYGWIN*) ! cygwin=true ! ;; ! Darwin*) ! macosx=true ! ;; esac *************** *** 37,41 **** # minimum acceptable version (first arg) and any other acceptable subsequent versions. <MAJOR>.<MINOR> should # be all that is necessary for the version form. ! $JAVA -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 1.6 1.7 if [ "$?" = "1" ]; then exit --- 54,58 ---- # minimum acceptable version (first arg) and any other acceptable subsequent versions. <MAJOR>.<MINOR> should # be all that is necessary for the version form. ! $JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 1.6 1.7 if [ "$?" = "1" ]; then exit *************** *** 78,82 **** # Check for updates and prompt to apply if any are available if [ -f "$UNIX_STYLE_HOME/update/downloads/core/squirrel-sql.jar" -a -f "$UNIX_STYLE_HOME/update/changeList.xml" ]; then ! $JAVA -cp "$UPDATE_CP" $MACOSX_UPDATER_PROPS -Dlog4j.defaultInitOverride=true -Dprompt=true net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchUpdateApplication -l "$UNIX_STYLE_HOME/update-log4j.properties" fi --- 95,99 ---- # Check for updates and prompt to apply if any are available if [ -f "$UNIX_STYLE_HOME/update/downloads/core/squirrel-sql.jar" -a -f "$UNIX_STYLE_HOME/update/changeList.xml" ]; then ! $JAVACMD -cp "$UPDATE_CP" $MACOSX_UPDATER_PROPS -Dlog4j.defaultInitOverride=true -Dprompt=true net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchUpdateApplication -l "$UNIX_STYLE_HOME/update-log4j.properties" fi *************** *** 89,91 **** # Launch SQuirreL application ! $JAVA -Xmx256m -cp "$TMP_CP" $MACOSX_SQUIRREL_PROPS net.sourceforge.squirrel_sql.client.Main --log-config-file "$UNIX_STYLE_HOME"/log4j.properties --squirrel-home "$UNIX_STYLE_HOME" $NATIVE_LAF_PROP $SCRIPT_ARGS --- 106,108 ---- # Launch SQuirreL application ! $JAVACMD -Xmx256m -cp "$TMP_CP" $MACOSX_SQUIRREL_PROPS net.sourceforge.squirrel_sql.client.Main --log-config-file "$UNIX_STYLE_HOME"/log4j.properties --squirrel-home "$UNIX_STYLE_HOME" $NATIVE_LAF_PROP $SCRIPT_ARGS |
|
From: Rob M. <man...@us...> - 2010-02-07 22:12:34
|
Update of /cvsroot/squirrel-sql/sql12/app/cmd In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19188/app/cmd Modified Files: squirrel-sql.sh Log Message: Bugfix 2939376: Documented the algorithm for finding the java executable to use and made the logic less terse/confusing. Merged the case statements into one case statement. Index: squirrel-sql.sh =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/cmd/squirrel-sql.sh,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** squirrel-sql.sh 23 Mar 2009 01:22:58 -0000 1.24 --- squirrel-sql.sh 7 Feb 2010 22:12:25 -0000 1.25 *************** *** 1,22 **** #! /bin/sh - [ ${JAVA_HOME} ] && JAVA=${JAVA_HOME}/bin/java || [ %JAVA_HOME ] && JAVA=%JAVA_HOME/bin/java || JAVA=java ! # Are we running within Cygwin on some version of Windows? cygwin=false; macosx=false; - - case "`uname -s`" in - CYGWIN*) cygwin=true ;; - esac case "`uname -s`" in ! Darwin) macosx=true;; esac # SQuirreL home. if $macosx ; then ! SQUIRREL_SQL_HOME='%INSTALL_PATH/Contents/Resources/Java' else ! SQUIRREL_SQL_HOME='%INSTALL_PATH' fi --- 1,39 ---- #! /bin/sh ! # IZPACK_JAVA_HOME is filtered in by the IzPack installer when this script is installed ! IZPACK_JAVA_HOME=%JAVA_HOME ! ! # We detect the java executable to use according to the following algorithm: ! # ! # 1. If it is located in JAVA_HOME, then we use that; or ! # 2. If the one used by the IzPack installer is available then use that, otherwise ! # 3. Use the java that is in the command path. ! # ! if [ -d "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then ! JAVACMD="$JAVA_HOME/bin/java" ! elif [ -d "$IZPACK_JAVA_HOME" -a -x "$IZPACK_JAVA_HOME/bin/java" ]; then ! JAVACMD="$IZPACK_JAVA_HOME/bin/java" ! else ! JAVACMD=java ! fi ! ! # Are we running within Cygwin on some version of Windows or on Mac OS X? cygwin=false; macosx=false; case "`uname -s`" in ! CYGWIN*) ! cygwin=true ! ;; ! Darwin*) ! macosx=true ! ;; esac # SQuirreL home. if $macosx ; then ! SQUIRREL_SQL_HOME='%INSTALL_PATH/Contents/Resources/Java' else ! SQUIRREL_SQL_HOME='%INSTALL_PATH' fi *************** *** 32,41 **** # Check to see if the JVM meets the minimum required to run SQuirreL and inform the user if not and skip # launch. versioncheck.jar is a special jar file which has been compiled with javac version 1.2.2, which ! # should be able to be run by that version of higher. The arguments to JavaVersionChecker below specify the # minimum acceptable version (first arg) and any other acceptable subsequent versions. <MAJOR>.<MINOR> should # be all that is necessary for the version form. ! $JAVA -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 1.6 1.7 if [ "$?" = "1" ]; then ! exit fi --- 49,58 ---- # Check to see if the JVM meets the minimum required to run SQuirreL and inform the user if not and skip # launch. versioncheck.jar is a special jar file which has been compiled with javac version 1.2.2, which ! # should be able to be run by that version or higher. The arguments to JavaVersionChecker below specify the # minimum acceptable version (first arg) and any other acceptable subsequent versions. <MAJOR>.<MINOR> should # be all that is necessary for the version form. ! $JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 1.6 1.7 if [ "$?" = "1" ]; then ! exit fi *************** *** 51,55 **** UPDATE_CP=$TMP_CP for a in "$UNIX_STYLE_HOME"/update/downloads/core/*; do ! UPDATE_CP="$a":"$UPDATE_CP" done --- 68,72 ---- UPDATE_CP=$TMP_CP for a in "$UNIX_STYLE_HOME"/update/downloads/core/*; do ! UPDATE_CP="$a":"$UPDATE_CP" done *************** *** 68,89 **** if $macosx ; then ! # Define mac-specific system properties if running on Mac OS X ! MACOSX_UPDATER_PROPS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=SQuirreLSQLUpdater" ! MACOSX_SQUIRREL_PROPS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=SQuirreLSQL" ! NATIVE_LAF_PROP="--native-laf" fi # Check for updates and prompt to apply if any are available if [ -f "$UNIX_STYLE_HOME/update/downloads/core/squirrel-sql.jar" -a -f "$UNIX_STYLE_HOME/update/changeList.xml" ]; then ! $JAVA -cp "$UPDATE_CP" $MACOSX_UPDATER_PROPS -Dlog4j.defaultInitOverride=true -Dprompt=true net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchUpdateApplication -l "$UNIX_STYLE_HOME/update-log4j.properties" fi if $macosx ; then ! # macosx provides unknown args to the script, causing SQuirreL to bail.. ! SCRIPT_ARGS="" else ! SCRIPT_ARGS="$1 $2 $3 $4 $5 $6 $7 $8 $9" fi # Launch SQuirreL application ! $JAVA -Xmx256m -cp "$TMP_CP" $MACOSX_SQUIRREL_PROPS net.sourceforge.squirrel_sql.client.Main --log-config-file "$UNIX_STYLE_HOME"/log4j.properties --squirrel-home "$UNIX_STYLE_HOME" $NATIVE_LAF_PROP $SCRIPT_ARGS --- 85,106 ---- if $macosx ; then ! # Define mac-specific system properties if running on Mac OS X ! MACOSX_UPDATER_PROPS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=SQuirreLSQLUpdater" ! MACOSX_SQUIRREL_PROPS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=SQuirreLSQL" ! NATIVE_LAF_PROP="--native-laf" fi # Check for updates and prompt to apply if any are available if [ -f "$UNIX_STYLE_HOME/update/downloads/core/squirrel-sql.jar" -a -f "$UNIX_STYLE_HOME/update/changeList.xml" ]; then ! $JAVACMD -cp "$UPDATE_CP" $MACOSX_UPDATER_PROPS -Dlog4j.defaultInitOverride=true -Dprompt=true net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchUpdateApplication -l "$UNIX_STYLE_HOME/update-log4j.properties" fi if $macosx ; then ! # macosx provides unknown args to the script, causing SQuirreL to bail.. ! SCRIPT_ARGS="" else ! SCRIPT_ARGS="$1 $2 $3 $4 $5 $6 $7 $8 $9" fi # Launch SQuirreL application ! $JAVACMD -Xmx256m -cp "$TMP_CP" $MACOSX_SQUIRREL_PROPS net.sourceforge.squirrel_sql.client.Main --log-config-file "$UNIX_STYLE_HOME"/log4j.properties --squirrel-home "$UNIX_STYLE_HOME" $NATIVE_LAF_PROP $SCRIPT_ARGS |
|
From: Gerd W. <ger...@us...> - 2010-02-07 18:49:04
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9727/app/src/net/sourceforge/squirrel_sql/client/gui/session Modified Files: SessionInternalFrame.java SQLInternalFrame.java Log Message: Moved focus to SQL Editor when it gets visible through previous Session / next Session navigation (Alt left/right) Index: SessionInternalFrame.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session/SessionInternalFrame.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SessionInternalFrame.java 29 Dec 2008 16:48:51 -0000 1.12 --- SessionInternalFrame.java 7 Feb 2010 18:48:56 -0000 1.13 *************** *** 156,158 **** --- 156,168 ---- } + @Override + public void moveToFront() + { + super.moveToFront(); + + if(MainPanel.ITabIndexes.SQL_TAB == _sessionPanel.getSelectedMainTabIndex()) + { + _sessionPanel.getSQLEntryPanel().requestFocus(); + } + } } Index: SQLInternalFrame.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** SQLInternalFrame.java 6 Jan 2009 00:11:20 -0000 1.22 --- SQLInternalFrame.java 7 Feb 2010 18:48:56 -0000 1.23 *************** *** 202,204 **** --- 202,211 ---- super.dispose(); //To change body of overridden methods use File | Settings | File Templates. } + + @Override + public void moveToFront() + { + super.moveToFront(); + _sqlPanel.getSQLEntryPanel().requestFocus(); + } } \ No newline at end of file |
|
From: Gerd W. <ger...@us...> - 2010-02-07 18:49:04
|
Update of /cvsroot/squirrel-sql/sql12/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9727/doc Modified Files: changes.txt Log Message: Moved focus to SQL Editor when it gets visible through previous Session / next Session navigation (Alt left/right) Index: changes.txt =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v retrieving revision 1.533 retrieving revision 1.534 diff -C2 -d -r1.533 -r1.534 *** changes.txt 7 Feb 2010 17:55:51 -0000 1.533 --- changes.txt 7 Feb 2010 18:48:56 -0000 1.534 *************** *** 92,95 **** --- 92,97 ---- Bug-Fixes: + Moved focus to SQL Editor when it gets visible through previous Session / next Session navigation (Alt left/right) + Fixed class not found exception in Oracle Plugin when setting Session Time Zone. Thanks to Neville Rowe |
|
From: Gerd W. <ger...@us...> - 2010-02-07 17:55:59
|
Update of /cvsroot/squirrel-sql/sql12/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2108/doc Modified Files: changes.txt Log Message: Fixed class not found exception in Oracle Plugin when setting Session Time Zone. Thanks to Neville Rowe Index: changes.txt =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v retrieving revision 1.532 retrieving revision 1.533 diff -C2 -d -r1.532 -r1.533 *** changes.txt 6 Feb 2010 21:56:57 -0000 1.532 --- changes.txt 7 Feb 2010 17:55:51 -0000 1.533 *************** *** 92,95 **** --- 92,98 ---- Bug-Fixes: + Fixed class not found exception in Oracle Plugin when setting Session Time Zone. + Thanks to Neville Rowe + 2946165: preferences messages not translatable 2946160: translation missing in refactoring |
|
From: Gerd W. <ger...@us...> - 2010-02-07 17:55:59
|
Update of /cvsroot/squirrel-sql/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2108/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle Modified Files: OraclePlugin.java Log Message: Fixed class not found exception in Oracle Plugin when setting Session Time Zone. Thanks to Neville Rowe Index: OraclePlugin.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** OraclePlugin.java 1 Jul 2009 21:37:24 -0000 1.60 --- OraclePlugin.java 7 Feb 2010 17:55:51 -0000 1.61 *************** *** 481,505 **** Connection con = session.getSQLConnection().getConnection(); String timezoneStr = prefs.getSessionTimezone(); ! try ! { ! if (s_log.isInfoEnabled()) ! { ! s_log.info("setTimezoneForSession: attempting to set the session timezone to : " + timezoneStr); ! } ! Class oraConClass = Class.forName("oracle.jdbc.OracleConnection"); ! Method setSessionTimeZoneMethod = oraConClass.getMethod("setSessionTimeZone", String.class); ! if (setSessionTimeZoneMethod != null) ! { ! setSessionTimeZoneMethod.invoke(con, timezoneStr); ! } else ! { ! s_log.error("setTimezoneForSession: setSessionTimeZoneMethod returned by reflection was null. " ! + "Skipped setting session timezone"); ! } ! } catch (Exception e) ! { ! s_log.error("Unexpected exception while trying to set session timezone: " + e.getMessage(), e); ! } ! } /** --- 481,508 ---- Connection con = session.getSQLConnection().getConnection(); String timezoneStr = prefs.getSessionTimezone(); ! try ! { ! if (s_log.isInfoEnabled()) ! { ! s_log.info("setTimezoneForSession: attempting to set the session timezone to : " + timezoneStr); ! } ! ! Method setSessionTimeZoneMethod = con.getClass().getMethod("setSessionTimeZone", String.class); ! if (setSessionTimeZoneMethod != null) ! { ! setSessionTimeZoneMethod.setAccessible(true); ! setSessionTimeZoneMethod.invoke(con, timezoneStr); ! } ! else ! { ! s_log.error("setTimezoneForSession: setSessionTimeZoneMethod returned by reflection was null. " ! + "Skipped setting session timezone"); ! } ! } ! catch (Exception e) ! { ! s_log.error("Unexpected exception while trying to set session timezone: " + e.getMessage(), e); ! } ! } /** |
|
From: Rob M. <man...@us...> - 2010-02-06 21:57:05
|
Update of /cvsroot/squirrel-sql/sql12/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32616/doc Modified Files: changes.txt Log Message: Bugfix : 2944128 (Fixed missing translation string). Index: changes.txt =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v retrieving revision 1.531 retrieving revision 1.532 diff -C2 -d -r1.531 -r1.532 *** changes.txt 31 Jan 2010 22:46:46 -0000 1.531 --- changes.txt 6 Feb 2010 21:56:57 -0000 1.532 *************** *** 92,95 **** --- 92,98 ---- Bug-Fixes: + 2946165: preferences messages not translatable + 2946160: translation missing in refactoring + 2944128: remote not translatable 2879711: Fix for Excel date export concerning dates earlier than 1900-03-01. Thanks to mironsadziak for the patch (Patch ID 2905218) |
|
From: Rob M. <man...@us...> - 2010-02-06 21:54:29
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/preferences In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31735/app/src/net/sourceforge/squirrel_sql/client/preferences Modified Files: UpdatePreferencesPanel.java I18NStrings.properties Log Message: Bugfix : 2944128 (Fixed missing translation string). Index: UpdatePreferencesPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/preferences/UpdatePreferencesPanel.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** UpdatePreferencesPanel.java 12 Dec 2008 02:52:00 -0000 1.9 --- UpdatePreferencesPanel.java 6 Feb 2010 21:54:20 -0000 1.10 *************** *** 90,93 **** --- 90,96 ---- String LOCAL_PATH = s_stringMgr.getString("UpdatePreferencesPanel.localPathLabel"); + // i18n[UpdatePreferencesPanel.localSiteButtonLabel=Local] + String LOCAL_SITE_BUTTON_LABEL = s_stringMgr.getString("UpdatePreferencesPanel.localSiteButtonLabel"); + // i18n[UpdatePreferencesPanel.path=Path:] String PATH = s_stringMgr.getString("UpdatePreferencesPanel.path"); *************** *** 105,108 **** --- 108,114 ---- String WEEKLY_LABEL = s_stringMgr.getString("UpdatePreferencesPanel.weeklyLabel"); + // i18n[UpdatePreferencesPanel.remoteSiteButtonLabel=Remote] + String REMOTE_SITE_BUTTON_LABEL = s_stringMgr.getString("UpdatePreferencesPanel.remoteSiteButtonLabel"); + // i18n[UpdatePreferencesPanel.siteTypeLabel=Site Type:] String SITE_TYPE_LABEL = s_stringMgr.getString("UpdatePreferencesPanel.siteTypeLabel"); *************** *** 152,158 **** private JLabel siteTypeLabel = null; ! private JRadioButton _remoteTypeButton = new JRadioButton("Remote"); ! private JRadioButton _localTypeButton = new JRadioButton("Local"); private ButtonGroup _updateSiteTypeGroup = new ButtonGroup(); --- 158,164 ---- private JLabel siteTypeLabel = null; ! private JRadioButton _remoteTypeButton = new JRadioButton(i18n.REMOTE_SITE_BUTTON_LABEL); ! private JRadioButton _localTypeButton = new JRadioButton(i18n.LOCAL_SITE_BUTTON_LABEL); private ButtonGroup _updateSiteTypeGroup = new ButtonGroup(); Index: I18NStrings.properties =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/preferences/I18NStrings.properties,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** I18NStrings.properties 11 Jan 2009 02:01:54 -0000 1.26 --- I18NStrings.properties 6 Feb 2010 21:54:21 -0000 1.27 *************** *** 85,90 **** --- 85,92 ---- UpdatePreferencesPanel.enableAutoUpdate=Enable Automatic Updates UpdatePreferencesPanel.localPathLabel=Local Path: + UpdatePreferencesPanel.localSiteButtonLabel=Local UpdatePreferencesPanel.path=Path: UpdatePreferencesPanel.port=Port: + UpdatePreferencesPanel.remoteSiteButtonLabel=Remote UpdatePreferencesPanel.server=Server: UpdatePreferencesPanel.siteTypeLabel=Site Type: |
|
From: Rob M. <man...@us...> - 2010-02-06 21:43:05
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe/action In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28839/app/src/net/sourceforge/squirrel_sql/client/mainframe/action Modified Files: SavePreferencesCommand.java I18NStrings.properties Log Message: Bugfix : 2946165 (Fixed missing translation string). Index: I18NStrings.properties =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe/action/I18NStrings.properties,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** I18NStrings.properties 25 Dec 2008 19:09:30 -0000 1.10 --- I18NStrings.properties 6 Feb 2010 21:42:57 -0000 1.11 *************** *** 62,65 **** --- 62,67 ---- ModifyDriverAction.error.selectingwindow=Error selecting window + SavePreferencesCommand.allPrefsSavedMsg=All Preferences have been saved. + ShowDriverWebsiteCommand.comfirm=No WebSite URL for the specified driver. Would you like to add one? Index: SavePreferencesCommand.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe/action/SavePreferencesCommand.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SavePreferencesCommand.java 2 Jul 2007 10:22:58 -0000 1.1 --- SavePreferencesCommand.java 6 Feb 2010 21:42:57 -0000 1.2 *************** *** 23,26 **** --- 23,28 ---- import net.sourceforge.squirrel_sql.fw.gui.IDialogUtils; import net.sourceforge.squirrel_sql.fw.util.ICommand; + import net.sourceforge.squirrel_sql.fw.util.StringManager; + import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; /** *************** *** 39,42 **** --- 41,48 ---- private IDialogUtils dialogUtils = null; + /** Internationalized strings for this class. */ + private static final StringManager s_stringMgr = + StringManagerFactory.getStringManager(SavePreferencesCommand.class); + /** * Ctor. *************** *** 75,79 **** { _app.saveApplicationState(); ! dialogUtils.showOk(_frame, "All Preferences have been saved."); } } --- 81,85 ---- { _app.saveApplicationState(); ! dialogUtils.showOk(_frame, s_stringMgr.getString("SavePreferencesCommand.allPrefsSavedMsg")); } } |
|
From: Rob M. <man...@us...> - 2010-02-06 21:38:53
|
Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28060/test/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent Modified Files: DataTypeFloatTest.java Log Message: Fixed test to correctly check for null if a non-empty float value is detected. Index: DataTypeFloatTest.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeFloatTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DataTypeFloatTest.java 26 Dec 2008 13:16:36 -0000 1.3 --- DataTypeFloatTest.java 6 Feb 2010 21:38:45 -0000 1.4 *************** *** 1,7 **** --- 1,10 ---- package net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent; + import static org.junit.Assert.assertNotNull; + import static org.junit.Assert.assertNull; import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition; import org.junit.Before; + import org.junit.Test; /* *************** *** 47,49 **** --- 50,65 ---- } + @Override + @Test + public void testGetWhereClauseValue() { + ColumnDisplayDefinition localMockColumnDisplayDefinition = + getMockColumnDisplayDefinition(); + mockHelper.replayAll(); + classUnderTest.setColumnDisplayDefinition(localMockColumnDisplayDefinition); + assertNotNull(classUnderTest.getWhereClauseValue(null, mockMetaData)); + // Floats cannot be used as where clause values as there are not precise. + assertNull(classUnderTest.getWhereClauseValue(getWhereClauseValueObject(), mockMetaData)); + mockHelper.verifyAll(); + } + } |
|
From: Rob M. <man...@us...> - 2010-02-06 15:46:31
|
Update of /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24460/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring Modified Files: RefactoringPlugin.java Added Files: I18NStrings.properties Log Message: Bugfix: 2946160 (Missing translation strings in refactoring menus) Index: RefactoringPlugin.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/RefactoringPlugin.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** RefactoringPlugin.java 16 Mar 2009 22:27:32 -0000 1.20 --- RefactoringPlugin.java 6 Feb 2010 15:46:22 -0000 1.21 *************** *** 34,37 **** --- 34,39 ---- import net.sourceforge.squirrel_sql.fw.gui.GUIUtils; import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; + import net.sourceforge.squirrel_sql.fw.util.StringManager; + import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import net.sourceforge.squirrel_sql.plugins.refactoring.actions.AddAutoIncrementAction; import net.sourceforge.squirrel_sql.plugins.refactoring.actions.AddColumnAction; *************** *** 67,78 **** public static final String BUNDLE_BASE_NAME = "net.sourceforge.squirrel_sql.plugins.refactoring.refactoring"; ! private interface IMenuResourceKeys { String REFACTORING = "refactoring"; ! String TABLE = "Table"; ! String COLUMN = "Column"; ! String INDEX = "Index"; ! String DATA_QUALITY = "Data Quality"; ! String REFERENTIAL_INTEGRITY = "Referential Integrity"; } --- 69,82 ---- public static final String BUNDLE_BASE_NAME = "net.sourceforge.squirrel_sql.plugins.refactoring.refactoring"; + private static final StringManager s_stringMgr = + StringManagerFactory.getStringManager(RefactoringPlugin.class); ! private static interface IMenuResourceKeys { String REFACTORING = "refactoring"; ! String TABLE = s_stringMgr.getString("RefactoringPlugin.tableMenuItemLabel"); ! String COLUMN = s_stringMgr.getString("RefactoringPlugin.columnMenuItemLabel"); ! String INDEX = s_stringMgr.getString("RefactoringPlugin.indexMenuItemLabel"); ! String DATA_QUALITY = s_stringMgr.getString("RefactoringPlugin.dataQualityMenuItemLabel"); ! String REFERENTIAL_INTEGRITY = s_stringMgr.getString("RefactoringPlugin.referentialIntegrityMenuItemLabel"); } *************** *** 115,119 **** */ public String getVersion() { ! return "0.21"; } --- 119,123 ---- */ public String getVersion() { ! return "0.22"; } *************** *** 281,286 **** _resources.addToMenu(col.get(ModifyColumnAction.class), columnMenu); _resources.addToMenu(col.get(MergeColumnAction.class), columnMenu); ! _resources.addToMenu(col.get(DropColumnAction.class), columnMenu); ! JMenu dataQualityMenu = new JMenu(IMenuResourceKeys.DATA_QUALITY); _resources.addToMenu(col.get(AddLookupTableAction.class), dataQualityMenu); --- 285,290 ---- _resources.addToMenu(col.get(ModifyColumnAction.class), columnMenu); _resources.addToMenu(col.get(MergeColumnAction.class), columnMenu); ! _resources.addToMenu(col.get(DropColumnAction.class), columnMenu); ! JMenu dataQualityMenu = new JMenu(IMenuResourceKeys.DATA_QUALITY); _resources.addToMenu(col.get(AddLookupTableAction.class), dataQualityMenu); --- NEW FILE: I18NStrings.properties --- RefactoringPlugin.columnMenuItemLabel=Column RefactoringPlugin.dataQualityMenuItemLabel=Data Quality RefactoringPlugin.indexMenuItemLabel=Index RefactoringPlugin.referentialIntegrityMenuItemLabel=Referential Integrity RefactoringPlugin.tableMenuItemLabel=Table |
|
From: Rob M. <man...@us...> - 2010-02-06 15:46:31
|
Update of /cvsroot/squirrel-sql/sql12/plugins/refactoring/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24460/plugins/refactoring/doc Modified Files: changes.txt Log Message: Bugfix: 2946160 (Missing translation strings in refactoring menus) Index: changes.txt =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/refactoring/doc/changes.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** changes.txt 16 Mar 2009 22:27:58 -0000 1.8 --- changes.txt 6 Feb 2010 15:46:21 -0000 1.9 *************** *** 2,5 **** --- 2,10 ---- ============================= + 0.22 + ==== + + - Fixed missing internationalization translation strings. + 0.21 ==== |
|
From: Rob M. <man...@us...> - 2010-01-31 22:46:54
|
Update of /cvsroot/squirrel-sql/sql12/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28069/doc Modified Files: changes.txt Log Message: Bug-2818117 ("Make Editable" uses column label instead of name): replaced the use of getLabel (rsmd.getColumnLabel()) with getColumnName (rsmd.getColumnName()). Index: changes.txt =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v retrieving revision 1.530 retrieving revision 1.531 diff -C2 -d -r1.530 -r1.531 *** changes.txt 30 Jan 2010 13:41:55 -0000 1.530 --- changes.txt 31 Jan 2010 22:46:46 -0000 1.531 *************** *** 92,96 **** Bug-Fixes: - 2879711: Fix for Excel date export concerning dates earlier than 1900-03-01. Thanks to mironsadziak for the patch (Patch ID 2905218) --- 92,95 ---- *************** *** 98,101 **** --- 97,102 ---- 2819161: squirrel-sql.sh in plain zip had an errant apostrophe. Tested this fix on MacOS 10 and Ubuntu 9.04. Thanks to Jonathan James for vetting the anonymously submitted patch. + 2818117 ("Make Editable" uses column label instead of name) + Thanks to Christian Gruenberg for the patch (Patch ID 2924887) 2801011: Sybase (CREATE TABLE script generate decimal(15,2) instead of (15,4)) 2794860: Sybase (CREATE TABLE script generate numeric(15) instead (15,2)) |
Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27636/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent Modified Files: DataTypeTimestamp.java DataTypeFloat.java DataTypeClob.java DataTypeBlob.java DataTypeBinary.java DataTypeUnknown.java DataTypeInteger.java DataTypeDate.java DataTypeTime.java BaseDataTypeComponent.java DataTypeBigDecimal.java DataTypeJavaObject.java DataTypeString.java DataTypeOther.java DataTypeDouble.java DataTypeLong.java DataTypeByte.java DataTypeShort.java DataTypeBoolean.java Log Message: Bug-2818117 ("Make Editable" uses column label instead of name): replaced the use of getLabel (rsmd.getColumnLabel()) with getColumnName (rsmd.getColumnName()). Index: DataTypeBinary.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBinary.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** DataTypeBinary.java 16 Feb 2009 22:56:24 -0000 1.22 --- DataTypeBinary.java 31 Jan 2010 22:44:31 -0000 1.23 *************** *** 411,415 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getLabel() + " IS NULL"; else //?? There does not seem to be any standard way to represent --- 411,415 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getColumnName() + " IS NULL"; else //?? There does not seem to be any standard way to represent Index: DataTypeLong.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeLong.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** DataTypeLong.java 11 Apr 2009 19:07:33 -0000 1.19 --- DataTypeLong.java 31 Jan 2010 22:44:32 -0000 1.20 *************** *** 388,394 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getLabel() + " IS NULL"; else ! return _colDef.getLabel() + "=" + value.toString(); } --- 388,394 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getColumnName() + " IS NULL"; else ! return _colDef.getColumnName() + "=" + value.toString(); } Index: DataTypeDate.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDate.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** DataTypeDate.java 11 Apr 2009 19:07:33 -0000 1.36 --- DataTypeDate.java 31 Jan 2010 22:44:32 -0000 1.37 *************** *** 520,524 **** if (value == null || value.toString() == null || value.toString().length() == 0) { ! return _colDef.getLabel() + " IS NULL"; } else --- 520,524 ---- if (value == null || value.toString() == null || value.toString().length() == 0) { ! return _colDef.getColumnName() + " IS NULL"; } else *************** *** 532,546 **** if (hasTimeComponent && hasDateComponent) { // treat it like a timestamp ! return _colDef.getLabel() + "={ts '" + value.toString() + "'}"; } else if (hasTimeComponent) { // treat it like a time - no date component ! return _colDef.getLabel() + "={t '" + value.toString() + "'}"; } else { if (DialectFactory.isOracle(md)) { // Oracle stores time information in java.sql.Types.Date columns // This tells Oracle that we are only talking about the date part. ! return "trunc(" + _colDef.getLabel() + ")={d '" + value.toString() + "'}"; } else { ! return _colDef.getLabel() + "={d '" + value.toString() + "'}"; } } --- 532,546 ---- if (hasTimeComponent && hasDateComponent) { // treat it like a timestamp ! return _colDef.getColumnName() + "={ts '" + value.toString() + "'}"; } else if (hasTimeComponent) { // treat it like a time - no date component ! return _colDef.getColumnName() + "={t '" + value.toString() + "'}"; } else { if (DialectFactory.isOracle(md)) { // Oracle stores time information in java.sql.Types.Date columns // This tells Oracle that we are only talking about the date part. ! return "trunc(" + _colDef.getColumnName() + ")={d '" + value.toString() + "'}"; } else { ! return _colDef.getColumnName() + "={d '" + value.toString() + "'}"; } } Index: DataTypeTime.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTime.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** DataTypeTime.java 11 Apr 2009 19:07:33 -0000 1.24 --- DataTypeTime.java 31 Jan 2010 22:44:32 -0000 1.25 *************** *** 488,494 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getLabel() + " IS NULL"; else ! return _colDef.getLabel() + "={t '" + value.toString() +"'}"; } --- 488,494 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getColumnName() + " IS NULL"; else ! return _colDef.getColumnName() + "={t '" + value.toString() +"'}"; } Index: DataTypeShort.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeShort.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** DataTypeShort.java 11 Apr 2009 19:07:33 -0000 1.18 --- DataTypeShort.java 31 Jan 2010 22:44:32 -0000 1.19 *************** *** 389,395 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getLabel() + " IS NULL"; else ! return _colDef.getLabel() + "=" + value.toString(); } --- 389,395 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getColumnName() + " IS NULL"; else ! return _colDef.getColumnName() + "=" + value.toString(); } Index: DataTypeTimestamp.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeTimestamp.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** DataTypeTimestamp.java 11 Apr 2009 19:07:33 -0000 1.29 --- DataTypeTimestamp.java 31 Jan 2010 22:44:31 -0000 1.30 *************** *** 507,516 **** return ""; if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getLabel() + " IS NULL"; else if (whereClauseUsage == USE_JDBC_ESCAPE_FORMAT) ! return _colDef.getLabel() + "={ts '" + value.toString() +"'}"; else ! return _colDef.getLabel() + "='" + value.toString() +"'"; } --- 507,516 ---- return ""; if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getColumnName() + " IS NULL"; else if (whereClauseUsage == USE_JDBC_ESCAPE_FORMAT) ! return _colDef.getColumnName() + "={ts '" + value.toString() +"'}"; else ! return _colDef.getColumnName() + "='" + value.toString() +"'"; } Index: DataTypeClob.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeClob.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** DataTypeClob.java 11 Apr 2009 19:07:33 -0000 1.25 --- DataTypeClob.java 31 Jan 2010 22:44:31 -0000 1.26 *************** *** 594,598 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || ((ClobDescriptor)value).getData() == null) ! return _colDef.getLabel() + " IS NULL"; else return ""; // CLOB cannot be used in WHERE clause --- 594,598 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || ((ClobDescriptor)value).getData() == null) ! return _colDef.getColumnName() + " IS NULL"; else return ""; // CLOB cannot be used in WHERE clause Index: DataTypeBlob.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBlob.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** DataTypeBlob.java 11 Apr 2009 19:07:33 -0000 1.16 --- DataTypeBlob.java 31 Jan 2010 22:44:31 -0000 1.17 *************** *** 566,570 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || ((BlobDescriptor)value).getData() == null) ! return _colDef.getLabel() + " IS NULL"; else return ""; // BLOB cannot be used in WHERE clause --- 566,570 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || ((BlobDescriptor)value).getData() == null) ! return _colDef.getColumnName() + " IS NULL"; else return ""; // BLOB cannot be used in WHERE clause Index: DataTypeByte.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeByte.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** DataTypeByte.java 11 Apr 2009 19:07:33 -0000 1.17 --- DataTypeByte.java 31 Jan 2010 22:44:32 -0000 1.18 *************** *** 389,395 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getLabel() + " IS NULL"; else ! return _colDef.getLabel() + "=" + value.toString(); } --- 389,395 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getColumnName() + " IS NULL"; else ! return _colDef.getColumnName() + "=" + value.toString(); } Index: DataTypeInteger.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeInteger.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** DataTypeInteger.java 11 Apr 2009 19:07:33 -0000 1.32 --- DataTypeInteger.java 31 Jan 2010 22:44:32 -0000 1.33 *************** *** 413,419 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getLabel() + " IS NULL"; else ! return _colDef.getLabel() + "=" + value.toString(); } --- 413,419 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getColumnName() + " IS NULL"; else ! return _colDef.getColumnName() + "=" + value.toString(); } Index: DataTypeJavaObject.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeJavaObject.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DataTypeJavaObject.java 11 Apr 2009 19:07:33 -0000 1.6 --- DataTypeJavaObject.java 31 Jan 2010 22:44:32 -0000 1.7 *************** *** 384,390 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null ) ! return _colDef.getLabel() + " IS NULL"; else ! return _colDef.getLabel() + "='" + value.toString() + "'"; } --- 384,390 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null ) ! return _colDef.getColumnName() + " IS NULL"; else ! return _colDef.getColumnName() + "='" + value.toString() + "'"; } Index: DataTypeString.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeString.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** DataTypeString.java 11 Apr 2009 19:07:33 -0000 1.35 --- DataTypeString.java 31 Jan 2010 22:44:32 -0000 1.36 *************** *** 326,330 **** // check for the case where we are limiting some columns // but not limiting this particular column ! if (_limitReadColumnNameMap.containsKey(_colDef.getLabel())) return true; // column is limited and length == limit, so need to re-read else return false; // column is not limited, so we have the whole thing --- 326,330 ---- // check for the case where we are limiting some columns // but not limiting this particular column ! if (_limitReadColumnNameMap.containsKey(_colDef.getColumnName())) return true; // column is limited and length == limit, so need to re-read else return false; // column is not limited, so we have the whole thing *************** *** 544,548 **** if (_limitReadOnSpecificColumns == false || (_limitReadOnSpecificColumns == true && ! _limitReadColumnNameMap.containsKey(_colDef.getLabel()))) { // this column is limited, so truncate the data data = data.substring(0, _limitReadLength); --- 544,548 ---- if (_limitReadOnSpecificColumns == false || (_limitReadOnSpecificColumns == true && ! _limitReadColumnNameMap.containsKey(_colDef.getColumnName()))) { // this column is limited, so truncate the data data = data.substring(0, _limitReadLength); *************** *** 574,581 **** if (_colDef.getSqlType() == Types.LONGVARCHAR && _useLongInWhere == false) ! return ""; // this column cannot be used in a WHERE clause if (value == null || value.toString() == null ) ! return _colDef.getLabel() + " IS NULL"; else { // We cannot use this data in the WHERE clause if it has been truncated. --- 574,581 ---- if (_colDef.getSqlType() == Types.LONGVARCHAR && _useLongInWhere == false) ! return null; // this column cannot be used in a WHERE clause if (value == null || value.toString() == null ) ! return _colDef.getColumnName() + " IS NULL"; else { // We cannot use this data in the WHERE clause if it has been truncated. *************** *** 583,588 **** // only use this in the WHERE clause if we do not need to re-read if ( ! needToReRead(value)) ! return _colDef.getLabel() + "='" + escapeLine(value.toString(), md) + "'"; ! else return ""; // value is truncated, so do not use in WHERE clause } } --- 583,593 ---- // only use this in the WHERE clause if we do not need to re-read if ( ! needToReRead(value)) ! { ! return _colDef.getColumnName() + "='" + escapeLine(value.toString(), md) + "'"; ! } ! else ! { ! return null; // value is truncated, so do not use in WHERE clause ! } } } Index: DataTypeBoolean.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBoolean.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** DataTypeBoolean.java 11 Apr 2009 19:07:33 -0000 1.21 --- DataTypeBoolean.java 31 Jan 2010 22:44:32 -0000 1.22 *************** *** 368,372 **** if (value == null || value.toString() == null || value.toString().length() == 0) { ! return _colDef.getLabel() + " IS NULL"; } --- 368,372 ---- if (value == null || value.toString() == null || value.toString().length() == 0) { ! return _colDef.getColumnName() + " IS NULL"; } *************** *** 374,378 **** { String bitValue = DatabaseSpecificBooleanValue.getBooleanValue(value.toString(), md); ! return _colDef.getLabel() + "=" + bitValue; } } --- 374,378 ---- { String bitValue = DatabaseSpecificBooleanValue.getBooleanValue(value.toString(), md); ! return _colDef.getColumnName() + "=" + bitValue; } } Index: DataTypeOther.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeOther.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** DataTypeOther.java 11 Apr 2009 19:07:33 -0000 1.16 --- DataTypeOther.java 31 Jan 2010 22:44:32 -0000 1.17 *************** *** 368,374 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null ) ! return _colDef.getLabel() + " IS NULL"; else ! return _colDef.getLabel() + "='" + value.toString() + "'"; } --- 368,374 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null ) ! return _colDef.getColumnName() + " IS NULL"; else ! return _colDef.getColumnName() + "='" + value.toString() + "'"; } Index: BaseDataTypeComponent.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/BaseDataTypeComponent.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BaseDataTypeComponent.java 11 Apr 2009 19:07:33 -0000 1.5 --- BaseDataTypeComponent.java 31 Jan 2010 22:44:32 -0000 1.6 *************** *** 300,304 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null ) { ! return _colDef.getLabel() + " IS NULL"; } else { return ""; --- 300,304 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null ) { ! return _colDef.getColumnName() + " IS NULL"; } else { return ""; Index: DataTypeUnknown.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeUnknown.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** DataTypeUnknown.java 11 Apr 2009 19:07:33 -0000 1.16 --- DataTypeUnknown.java 31 Jan 2010 22:44:32 -0000 1.17 *************** *** 359,363 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getLabel() + " IS NULL"; else return ""; --- 359,363 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getColumnName() + " IS NULL"; else return ""; Index: DataTypeDouble.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDouble.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** DataTypeDouble.java 11 Apr 2009 19:07:33 -0000 1.17 --- DataTypeDouble.java 31 Jan 2010 22:44:32 -0000 1.18 *************** *** 422,432 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { ! if (value == null || value.toString() == null || value.toString().length() == 0) return _colDef.getLabel() ! + " IS NULL"; ! else ! // since we cannot do exact matches on floating point ! // numbers, we cannot use this field in the WHERE clause. ! return null; ! // return _colDef.getLabel() + "=" + value.toString(); } --- 422,435 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { ! if (value == null || value.toString() == null || value.toString().length() == 0) ! { ! return _colDef.getColumnName() + " IS NULL"; ! } ! else ! { ! // since we cannot do exact matches on floating point ! // numbers, we cannot use this field in the WHERE clause. ! return null; ! } } Index: DataTypeBigDecimal.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBigDecimal.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** DataTypeBigDecimal.java 11 Apr 2009 19:07:33 -0000 1.24 --- DataTypeBigDecimal.java 31 Jan 2010 22:44:32 -0000 1.25 *************** *** 498,504 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getLabel() + " IS NULL"; else ! return _colDef.getLabel() + "=" + value.toString(); } --- 498,504 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getColumnName() + " IS NULL"; else ! return _colDef.getColumnName() + "=" + value.toString(); } Index: DataTypeFloat.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeFloat.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** DataTypeFloat.java 11 Apr 2009 19:07:33 -0000 1.17 --- DataTypeFloat.java 31 Jan 2010 22:44:31 -0000 1.18 *************** *** 424,434 **** */ public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { ! if (value == null || value.toString() == null || value.toString().length() == 0) ! return _colDef.getLabel() + " IS NULL"; ! else // since we cannot do exact matches on floating point // numbers, we cannot use this field in the WHERE clause. ! return ""; ! // return _colDef.getLabel() + "=" + value.toString(); } --- 424,434 ---- */ public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { ! if (value == null || value.toString() == null || value.toString().length() == 0) { ! return _colDef.getColumnName() + " IS NULL"; ! } else { // since we cannot do exact matches on floating point // numbers, we cannot use this field in the WHERE clause. ! return null; ! } } |
|
From: Rob M. <man...@us...> - 2010-01-31 22:44:40
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27636/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs Modified Files: BasePreparedStatementTab.java Log Message: Bug-2818117 ("Make Editable" uses column label instead of name): replaced the use of getLabel (rsmd.getColumnLabel()) with getColumnName (rsmd.getColumnName()). Index: BasePreparedStatementTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BasePreparedStatementTab.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BasePreparedStatementTab.java 27 Dec 2008 19:20:53 -0000 1.5 --- BasePreparedStatementTab.java 31 Jan 2010 22:44:32 -0000 1.6 *************** *** 164,168 **** for (int i = 0; i < columnCount; ++i) { ! data.put(colDefs[i].getLabel(), rsds.get(i)); } } --- 164,168 ---- for (int i = 0; i < columnCount; ++i) { ! data.put(colDefs[i].getColumnName(), rsds.get(i)); } } |
|
From: Rob M. <man...@us...> - 2010-01-31 22:44:40
|
Update of /cvsroot/squirrel-sql/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/types In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27636/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/types Modified Files: OracleXmlTypeDataTypeComponent.java Log Message: Bug-2818117 ("Make Editable" uses column label instead of name): replaced the use of getLabel (rsmd.getColumnLabel()) with getColumnName (rsmd.getColumnName()). Index: OracleXmlTypeDataTypeComponent.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/types/OracleXmlTypeDataTypeComponent.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** OracleXmlTypeDataTypeComponent.java 11 Apr 2009 19:08:58 -0000 1.7 --- OracleXmlTypeDataTypeComponent.java 31 Jan 2010 22:44:32 -0000 1.8 *************** *** 114,118 **** * For Oracle 10g we could say something like : * ! * "where XMLSERIALIZE(CONTENT " + _colDef.getLabel() +") like '<value>'" * * This doesn't appear to work on Oracle 9i at the moment, so we will --- 114,118 ---- * For Oracle 10g we could say something like : * ! * "where XMLSERIALIZE(CONTENT " + _colDef.getColumnName() +") like '<value>'" * * This doesn't appear to work on Oracle 9i at the moment, so we will |
Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27636/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer Modified Files: MyTableModel.java DataSetViewerTablePanel.java DataSetViewerTextPanel.java RowDataInputFrame.java Log Message: Bug-2818117 ("Make Editable" uses column label instead of name): replaced the use of getLabel (rsmd.getColumnLabel()) with getColumnName (rsmd.getColumnName()). Index: DataSetViewerTextPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DataSetViewerTextPanel.java 21 Dec 2005 21:11:15 -0000 1.5 --- DataSetViewerTextPanel.java 31 Jan 2010 22:44:32 -0000 1.6 *************** *** 73,77 **** for (int i = 0; i < colDefs.length; ++i) { ! buf.append(format(colDefs[i].getLabel(), colDefs[i].getDisplayWidth(), ' ')); } addLine(buf.toString()); --- 73,77 ---- for (int i = 0; i < colDefs.length; ++i) { ! buf.append(format(colDefs[i].getColumnName(), colDefs[i].getDisplayWidth(), ' ')); } addLine(buf.toString()); *************** *** 164,167 **** --- 164,169 ---- private final class MyJTextArea extends JTextArea { + private static final long serialVersionUID = 1L; + private TextPopupMenu _textPopupMenu; *************** *** 213,216 **** --- 215,220 ---- private static class MyJTextAreaPopupMenu extends TextPopupMenu { + private static final long serialVersionUID = 1L; + private MakeEditableAction _makeEditable = new MakeEditableAction(); *************** *** 236,239 **** --- 240,245 ---- private class MakeEditableAction extends BaseAction { + private static final long serialVersionUID = 1L; + MakeEditableAction() { Index: MyTableModel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MyTableModel.java 7 Aug 2007 01:03:26 -0000 1.8 --- MyTableModel.java 31 Jan 2010 22:44:32 -0000 1.9 *************** *** 115,119 **** else { ! return _colDefs != null ? _colDefs[col].getLabel() : super.getColumnName(col); } } --- 115,119 ---- else { ! return _colDefs != null ? _colDefs[col].getColumnName() : super.getColumnName(col); } } Index: RowDataInputFrame.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/RowDataInputFrame.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** RowDataInputFrame.java 25 Dec 2008 19:09:32 -0000 1.13 --- RowDataInputFrame.java 31 Jan 2010 22:44:32 -0000 1.14 *************** *** 53,56 **** --- 53,58 ---- implements ActionListener { + private static final long serialVersionUID = 1L; + private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(RowDataInputFrame.class); *************** *** 182,186 **** */ class RowDataJTable extends JTable { ! private ColumnDisplayDefinition[] _colDefs = null; --- 184,188 ---- */ class RowDataJTable extends JTable { ! private static final long serialVersionUID = 1L; private ColumnDisplayDefinition[] _colDefs = null; *************** *** 211,215 **** TableColumn col = new TableColumn(i, colWidth, CellComponentFactory.getTableCellRenderer(colDefs[i]), null); ! col.setHeaderValue(colDef.getLabel()); cm.addColumn(col); } --- 213,217 ---- TableColumn col = new TableColumn(i, colWidth, CellComponentFactory.getTableCellRenderer(colDefs[i]), null); ! col.setHeaderValue(colDef.getColumnName()); cm.addColumn(col); } *************** *** 336,339 **** --- 338,343 ---- class RowDataModel extends DefaultTableModel { + private static final long serialVersionUID = 1L; + /** * ctor *************** *** 346,350 **** Object[][] rowData = new Object[2][colDefs.length]; for (int i=0; i<colDefs.length; i++) { ! colNames[i] = colDefs[i].getLabel(); // set column heading rowData[0][i] = initalValues[i]; // set data in first row --- 350,354 ---- Object[][] rowData = new Object[2][colDefs.length]; for (int i=0; i<colDefs.length; i++) { ! colNames[i] = colDefs[i].getColumnName(); // set column heading rowData[0][i] = initalValues[i]; // set data in first row Index: DataSetViewerTablePanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** DataSetViewerTablePanel.java 11 Jun 2009 18:48:56 -0000 1.35 --- DataSetViewerTablePanel.java 31 Jan 2010 22:44:32 -0000 1.36 *************** *** 20,63 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import java.awt.Component; import java.awt.Point; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; - import java.awt.event.KeyEvent; import java.awt.event.MouseMotionAdapter; import javax.swing.DefaultCellEditor; import javax.swing.JTable; import javax.swing.ListSelectionModel; import javax.swing.table.DefaultTableColumnModel; import javax.swing.table.TableCellEditor; import javax.swing.table.TableColumnModel; - import javax.swing.JOptionPane; - import javax.swing.event.TableModelEvent; - - //??import javax.swing.event.TableModelListener; - //??import javax.swing.event.TableModelEvent; import net.sourceforge.squirrel_sql.fw.gui.ButtonTableHeader; import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel; import net.sourceforge.squirrel_sql.fw.gui.TablePopupMenu; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; - import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; - import net.sourceforge.squirrel_sql.fw.util.StringManager; - import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory; - import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.RestorableJTextField; - - // for printing... - - import java.awt.print.Printable; - import java.awt.Graphics; - import java.awt.print.PageFormat; - import java.awt.print.PrinterException; - import java.awt.Graphics2D; - import java.awt.Color; - import javax.swing.table.JTableHeader; - import java.awt.Font; - import java.util.ArrayList; public class DataSetViewerTablePanel extends BaseDataSetViewerDestination --- 20,55 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + import java.awt.Color; import java.awt.Component; + import java.awt.Font; + import java.awt.Graphics; + import java.awt.Graphics2D; import java.awt.Point; + import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; + import java.awt.print.PageFormat; + import java.awt.print.Printable; + import java.awt.print.PrinterException; import javax.swing.DefaultCellEditor; + import javax.swing.JOptionPane; import javax.swing.JTable; import javax.swing.ListSelectionModel; import javax.swing.table.DefaultTableColumnModel; + import javax.swing.table.JTableHeader; import javax.swing.table.TableCellEditor; import javax.swing.table.TableColumnModel; + import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory; + import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.RestorableJTextField; import net.sourceforge.squirrel_sql.fw.gui.ButtonTableHeader; import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel; import net.sourceforge.squirrel_sql.fw.gui.TablePopupMenu; + import net.sourceforge.squirrel_sql.fw.util.StringManager; + import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; public class DataSetViewerTablePanel extends BaseDataSetViewerDestination *************** *** 457,461 **** ExtTableColumn col = new ExtTableColumn(i, colWidth, CellComponentFactory.getTableCellRenderer(colDefs[i]), null); ! col.setHeaderValue(colDef.getLabel()); col.setColumnDisplayDefinition(colDef); cm.addColumn(col); --- 449,453 ---- ExtTableColumn col = new ExtTableColumn(i, colWidth, CellComponentFactory.getTableCellRenderer(colDefs[i]), null); ! col.setHeaderValue(colDef.getColumnName()); col.setColumnDisplayDefinition(colDef); cm.addColumn(col); |
|
From: Rob M. <man...@us...> - 2010-01-31 22:44:40
|
Update of /cvsroot/squirrel-sql/sql12/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/types In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27636/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/types Modified Files: DerbyClobDataTypeComponent.java Log Message: Bug-2818117 ("Make Editable" uses column label instead of name): replaced the use of getLabel (rsmd.getColumnLabel()) with getColumnName (rsmd.getColumnName()). Index: DerbyClobDataTypeComponent.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/types/DerbyClobDataTypeComponent.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DerbyClobDataTypeComponent.java 26 Dec 2008 13:59:23 -0000 1.3 --- DerbyClobDataTypeComponent.java 31 Jan 2010 22:44:32 -0000 1.4 *************** *** 457,461 **** public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || ((DerbyClobDescriptor) value).getData() == null) ! return _colDef.getLabel() + " IS NULL"; else return ""; // CLOB cannot be used in WHERE clause --- 457,461 ---- public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md) { if (value == null || ((DerbyClobDescriptor) value).getData() == null) ! return _colDef.getColumnName() + " IS NULL"; else return ""; // CLOB cannot be used in WHERE clause |
|
From: Rob M. <man...@us...> - 2010-01-31 22:44:40
|
Update of /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27636/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab Modified Files: BaseSQLTab.java Log Message: Bug-2818117 ("Make Editable" uses column label instead of name): replaced the use of getLabel (rsmd.getColumnLabel()) with getColumnName (rsmd.getColumnName()). Index: BaseSQLTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab/BaseSQLTab.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** BaseSQLTab.java 6 Dec 2007 03:37:10 -0000 1.8 --- BaseSQLTab.java 31 Jan 2010 22:44:32 -0000 1.9 *************** *** 166,170 **** for (int i = 0; i < columnCount; ++i) { ! data.put(colDefs[i].getLabel(), rsds.get(i)); } } --- 166,170 ---- for (int i = 0; i < columnCount; ++i) { ! data.put(colDefs[i].getColumnName(), rsds.get(i)); } } |
|
From: Rob M. <man...@us...> - 2010-01-31 22:44:40
|
Update of /cvsroot/squirrel-sql/sql12/plugins/postgres/src/net/sourceforge/squirrel_sql/plugins/postgres/types In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27636/plugins/postgres/src/net/sourceforge/squirrel_sql/plugins/postgres/types Modified Files: PostgreSqlOtherTypeDataTypeComponent.java Log Message: Bug-2818117 ("Make Editable" uses column label instead of name): replaced the use of getLabel (rsmd.getColumnLabel()) with getColumnName (rsmd.getColumnName()). Index: PostgreSqlOtherTypeDataTypeComponent.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/postgres/src/net/sourceforge/squirrel_sql/plugins/postgres/types/PostgreSqlOtherTypeDataTypeComponent.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PostgreSqlOtherTypeDataTypeComponent.java 5 Apr 2008 02:27:08 -0000 1.1 --- PostgreSqlOtherTypeDataTypeComponent.java 31 Jan 2010 22:44:32 -0000 1.2 *************** *** 104,108 **** if (value == null || value.toString() == null) { ! return _colDef.getLabel() + " IS NULL"; } else { --- 104,108 ---- if (value == null || value.toString() == null) { ! return _colDef.getColumnName() + " IS NULL"; } else { |
|
From: Rob M. <man...@us...> - 2010-01-31 22:44:40
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27636/app/src/net/sourceforge/squirrel_sql/client/session Modified Files: DataSetUpdateableTableModelImpl.java Log Message: Bug-2818117 ("Make Editable" uses column label instead of name): replaced the use of getLabel (rsmd.getColumnLabel()) with getColumnName (rsmd.getColumnName()). Index: DataSetUpdateableTableModelImpl.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/DataSetUpdateableTableModelImpl.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** DataSetUpdateableTableModelImpl.java 18 May 2008 13:03:26 -0000 1.17 --- DataSetUpdateableTableModelImpl.java 31 Jan 2010 22:44:32 -0000 1.18 *************** *** 388,392 **** final Statement stmt = conn.createStatement(); final String queryString = ! "SELECT " + colDefs[col].getLabel() +" FROM "+ti.getQualifiedName() + whereClause; --- 388,392 ---- final Statement stmt = conn.createStatement(); final String queryString = ! "SELECT " + colDefs[col].getColumnName() +" FROM "+ti.getQualifiedName() + whereClause; *************** *** 467,471 **** final String sql = constructUpdateSql( ! ti.getQualifiedName(), colDefs[col].getLabel(), whereClause); if (s_log.isDebugEnabled()) { --- 467,471 ---- final String sql = constructUpdateSql( ! ti.getQualifiedName(), colDefs[col].getColumnName(), whereClause); if (s_log.isDebugEnabled()) { *************** *** 590,594 **** // If this name is NOT in the list, then skip it; otherwise we fall through // and use the column in the WHERE clause ! if (colNames.get(colDefs[i].getLabel()) == null) continue; // go on to the next item } --- 590,594 ---- // If this name is NOT in the list, then skip it; otherwise we fall through // and use the column in the WHERE clause ! if (colNames.get(colDefs[i].getColumnName()) == null) continue; // go on to the next item } *************** *** 791,795 **** if (defValue != null && defValue.length() > 0) { // find the entry in colDefs matching this column ! if (colDefs[expectedColDefIndex].getLabel().equals(colName)) { // DB cols are in same order as colDefs defaultValues[expectedColDefIndex] = defValue; --- 791,795 ---- if (defValue != null && defValue.length() > 0) { // find the entry in colDefs matching this column ! if (colDefs[expectedColDefIndex].getColumnName().equals(colName)) { // DB cols are in same order as colDefs defaultValues[expectedColDefIndex] = defValue; *************** *** 801,805 **** // because most tables do not have huge numbers of columns. for (int i=0; i<colDefs.length; i++) { ! if (colDefs[i].getLabel().equals(colName)) { defaultValues[i] = defValue; break; --- 801,805 ---- // because most tables do not have huge numbers of columns. for (int i=0; i<colDefs.length; i++) { ! if (colDefs[i].getColumnName().equals(colName)) { defaultValues[i] = defValue; break; |
|
From: Rob M. <man...@us...> - 2010-01-31 22:44:39
|
Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27636/test/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent Modified Files: AbstractDataTypeComponentTest.java Log Message: Bug-2818117 ("Make Editable" uses column label instead of name): replaced the use of getLabel (rsmd.getColumnLabel()) with getColumnName (rsmd.getColumnName()). Index: AbstractDataTypeComponentTest.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/AbstractDataTypeComponentTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AbstractDataTypeComponentTest.java 11 Apr 2009 19:07:45 -0000 1.4 --- AbstractDataTypeComponentTest.java 31 Jan 2010 22:44:31 -0000 1.5 *************** *** 78,82 **** expect(columnDisplayDefinition.getScale()).andStubReturn(3); expect(columnDisplayDefinition.getColumnSize()).andStubReturn(10); ! expect(columnDisplayDefinition.getLabel()).andStubReturn("testLabel"); expect(columnDisplayDefinition.getSqlType()).andStubReturn(Types.VARCHAR); expect(columnDisplayDefinition.getSqlTypeName()).andStubReturn("VARCHAR"); --- 78,82 ---- expect(columnDisplayDefinition.getScale()).andStubReturn(3); expect(columnDisplayDefinition.getColumnSize()).andStubReturn(10); ! expect(columnDisplayDefinition.getColumnName()).andStubReturn("testLabel"); expect(columnDisplayDefinition.getSqlType()).andStubReturn(Types.VARCHAR); expect(columnDisplayDefinition.getSqlTypeName()).andStubReturn("VARCHAR"); *************** *** 89,93 **** classUnderTest.setColumnDisplayDefinition(mockColumnDisplayDefinition); classUnderTest.setBeepHelper(mockBeepHelper); ! expect(mockColumnDisplayDefinition.getLabel()).andStubReturn("testLabel"); expect(mockMetaData.getDatabaseProductName()).andStubReturn("testDatabaseProductName"); expect(mockMetaData.getDatabaseProductVersion()).andStubReturn("testDatabaseProductVersion"); --- 89,93 ---- classUnderTest.setColumnDisplayDefinition(mockColumnDisplayDefinition); classUnderTest.setBeepHelper(mockBeepHelper); ! expect(mockColumnDisplayDefinition.getColumnName()).andStubReturn("testLabel"); expect(mockMetaData.getDatabaseProductName()).andStubReturn("testDatabaseProductName"); expect(mockMetaData.getDatabaseProductVersion()).andStubReturn("testDatabaseProductVersion"); |
|
From: Rob M. <man...@us...> - 2010-01-30 13:42:03
|
Update of /cvsroot/squirrel-sql/sql12/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22264/doc Modified Files: changes.txt Log Message: Updated french translation from Erwan DUROSELLE Index: changes.txt =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v retrieving revision 1.529 retrieving revision 1.530 diff -C2 -d -r1.529 -r1.530 *** changes.txt 24 Jan 2010 20:55:05 -0000 1.529 --- changes.txt 30 Jan 2010 13:41:55 -0000 1.530 *************** *** 10,13 **** --- 10,14 ---- - Korean (Thanks to Youngwoo Kim) - Chinese (Thanks to xpdz) + - French (Thanks to Erwan DUROSELLE) Improved display of SQL result metadata |
