|
From: <man...@us...> - 2010-10-16 17:44:47
|
Revision: 5923
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5923&view=rev
Author: manningr
Date: 2010-10-16 17:44:40 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
Bug 3088284 (CSV export doesn't escape quotes): Thanks to wolfgang22 for the patch.
Modified Paths:
--------------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommand.java
Added Paths:
-----------
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommandTest.java
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommand.java 2010-10-16 17:02:32 UTC (rev 5922)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommand.java 2010-10-16 17:44:40 UTC (rev 5923)
@@ -609,7 +609,7 @@
{
String ret = cellObj.toString().trim();
- if(0 <= ret.indexOf(sepChar) || 0 <= ret.indexOf('\n'))
+ if(0 <= ret.indexOf(sepChar) || 0 <= ret.indexOf('\n') || 0 <= ret.indexOf('"'))
{
ret = "\"" + ret.replaceAll("\"", "\"\"") + "\"";
}
Added: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommandTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommandTest.java (rev 0)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommandTest.java 2010-10-16 17:44:40 UTC (rev 5923)
@@ -0,0 +1,64 @@
+package net.sourceforge.squirrel_sql.fw.gui.action;
+
+/*
+ * Copyright (C) 2010 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+import static org.junit.Assert.assertEquals;
+
+import java.lang.reflect.Method;
+
+import javax.swing.JTable;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TableExportCsvCommandTest
+{
+
+ private final String TEST_DATA = "Super \"Luxurious\" Truck";
+
+ // See http://en.wikipedia.org/wiki/Comma-separated_values#Basic_rules for proper quote handling definition
+ private final String TEST_DATA_PROPERLY_QUOTED = "\"Super \"\"Luxurious\"\" Truck\"";
+
+ private TableExportCsvCommand classUnderTest = null;
+
+ @Mock
+ private JTable mockJTable;
+
+ @Before
+ public void setup() {
+ classUnderTest = new TableExportCsvCommand(mockJTable);
+ }
+
+
+ @Test
+ public void testGetDataCSVProperQuoteHandling() throws Exception
+ {
+ Method m = TableExportCsvCommand.class.getDeclaredMethod("getDataCSV", String.class, Object.class);
+ m.setAccessible(true);
+ String separatorChar = ",";
+ String result = (String) m.invoke(classUnderTest, separatorChar, TEST_DATA);
+ assertEquals(TEST_DATA_PROPERLY_QUOTED, result);
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-10-30 17:53:17
|
Revision: 5936
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5936&view=rev
Author: manningr
Date: 2010-10-30 17:53:10 +0000 (Sat, 30 Oct 2010)
Log Message:
-----------
New utility method to detect if the jdbc type is "standard" (that is, if it is defined in java.sql.Types which is JVM-dependent).
Modified Paths:
--------------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/JDBCTypeMapper.java
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/sql/JDBCTypeMapperTest.java
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/JDBCTypeMapper.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/JDBCTypeMapper.java 2010-10-30 17:51:41 UTC (rev 5935)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/JDBCTypeMapper.java 2010-10-30 17:53:10 UTC (rev 5936)
@@ -33,7 +33,7 @@
/** logger for this class */
private static ILogger s_log = LoggerController.createLogger(JDBCTypeMapper.class);
-
+
/**
* Returns a list of Type names that are found in the java.sql.Types class using reflection.
*
@@ -41,12 +41,13 @@
*/
public static String[] getJdbcTypeList()
{
- ArrayList<String> result = new ArrayList<String>();
+ ArrayList<String> result = new ArrayList<String>();
Field[] fields = java.sql.Types.class.getDeclaredFields();
- for (int i = 0; i < fields.length; i++) {
- Field field = fields[i];
- result.add(field.getName());
- }
+ for (int i = 0; i < fields.length; i++)
+ {
+ Field field = fields[i];
+ result.add(field.getName());
+ }
return result.toArray(new String[result.size()]);
}
@@ -68,63 +69,61 @@
}
catch (SecurityException e)
{
- s_log.error("getJdbcTypeName: unexpected exception: "+e.getMessage(), e);
+ s_log.error("getJdbcTypeName: unexpected exception: " + e.getMessage(), e);
}
catch (IllegalArgumentException e)
{
- s_log.error("getJdbcTypeName: unexpected exception: "+e.getMessage(), e);
+ s_log.error("getJdbcTypeName: unexpected exception: " + e.getMessage(), e);
}
catch (IllegalAccessException e)
{
- s_log.error("getJdbcTypeName: unexpected exception: "+e.getMessage(), e);
+ s_log.error("getJdbcTypeName: unexpected exception: " + e.getMessage(), e);
}
return result;
}
-
+
/**
- * Returns the java.sql.Types.java type of the specified type name. If the type is not found then
+ * Returns the java.sql.Types.java type of the specified type name. If the type is not found then
* defaultVal is returned.
*
- * @param jdbcTypeName the name to lookup.
- *
+ * @param jdbcTypeName
+ * the name to lookup.
* @return the type code
*/
- public static int getJdbcType(String jdbcTypeName, int defaultVal) {
-
- if (jdbcTypeName == null)
- {
- return Types.NULL;
- }
+ public static int getJdbcType(String jdbcTypeName, int defaultVal)
+ {
+
+ if (jdbcTypeName == null) { return Types.NULL; }
int result = defaultVal;
-
+
try
{
Field[] fields = java.sql.Types.class.getDeclaredFields();
for (int i = 0; i < fields.length; i++)
{
Field field = fields[i];
- if (field.getName().equalsIgnoreCase(jdbcTypeName)) {
+ if (field.getName().equalsIgnoreCase(jdbcTypeName))
+ {
result = field.getInt(null);
}
}
}
catch (IllegalArgumentException e)
{
- s_log.error("getJdbcTypeName: unexpected exception: "+e.getMessage(), e);
+ s_log.error("getJdbcTypeName: unexpected exception: " + e.getMessage(), e);
}
catch (IllegalAccessException e)
{
- s_log.error("getJdbcTypeName: unexpected exception: "+e.getMessage(), e);
+ s_log.error("getJdbcTypeName: unexpected exception: " + e.getMessage(), e);
}
return result;
}
-
-
+
/**
- * Returns a type code for the specified type name. If not found then this will return Types.NULL.
+ * Returns a type code for the specified type name. If not found then this will return Types.NULL.
*
- * @param jdbcTypeName the name to lookup.
- *
+ * @param jdbcTypeName
+ * the name to lookup.
* @return the type code
*/
public static int getJdbcType(String jdbcTypeName)
@@ -215,4 +214,36 @@
throw new IllegalArgumentException("Unknown index sort order: " + sortOrder);
}
+
+ /**
+ * Returns a boolean indicating whether or not the specified typeCode is a field in the java.sql.Types
+ * class as implemented in the current JVM.
+ *
+ * @param typeCode
+ * the Java sql type code as reported by the JDBC driver.
+ * @return true if the specified typeCode is standard; false otherwise.
+ */
+ public static boolean isStandardType(int typeCode)
+ {
+ boolean result = false;
+ Field[] fields = Types.class.getDeclaredFields();
+ for (Field field : fields)
+ {
+ String fieldName = field.getName();
+ try
+ {
+ int fieldValue = field.getInt(null);
+ if (fieldValue == typeCode)
+ {
+ result = true;
+ }
+ }
+ catch (Exception e)
+ {
+ s_log.error("isStandardType: unable to get value for java.sql.Types." + fieldName + " : "
+ + e.getMessage(), e);
+ }
+ }
+ return result;
+ }
}
Modified: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/sql/JDBCTypeMapperTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/sql/JDBCTypeMapperTest.java 2010-10-30 17:51:41 UTC (rev 5935)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/sql/JDBCTypeMapperTest.java 2010-10-30 17:53:10 UTC (rev 5936)
@@ -140,6 +140,10 @@
}
}
+ public void testIsStandardType() throws Exception {
+ assertTrue(JDBCTypeMapper.isStandardType(Types.VARCHAR));
+ }
+
private interface TypeCheck {
boolean isType(int type);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2011-06-01 18:55:20
|
Revision: 6282
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6282&view=rev
Author: wis775
Date: 2011-06-01 18:55:13 +0000 (Wed, 01 Jun 2011)
Log Message:
-----------
Use the right name for the action, if only one WIKI configuration is present.
Modified Paths:
--------------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactory.java
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactoryTest.java
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactory.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactory.java 2011-06-01 18:36:38 UTC (rev 6281)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactory.java 2011-06-01 18:55:13 UTC (rev 6282)
@@ -109,9 +109,9 @@
*/
private JMenuItem createMenuForExactlyOneConfiguration(ITableActionCallback callback,
IWikiTableConfiguration configuration) {
- JMenuItem item = new JMenuItem(s_stringMgr.getString("TablePopupMenu.copyaswikitableSpecific", configuration.getName()));
- item.setAction(new CopyWikiTableAction(configuration .getName(), configuration, callback));
- return item;
+ String actionName = s_stringMgr.getString("TablePopupMenu.copyaswikitableSpecific", configuration.getName());
+ CopyWikiTableAction action = new CopyWikiTableAction(actionName, configuration, callback);
+ return new JMenuItem(action);
}
Modified: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactoryTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactoryTest.java 2011-06-01 18:36:38 UTC (rev 6281)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactoryTest.java 2011-06-01 18:55:13 UTC (rev 6282)
@@ -105,6 +105,7 @@
JMenuItem menuItem = classUnderTest.createMenueItem(mockCallback);
assertNotNull(menuItem);
assertEquals(JMenuItem.class, menuItem.getClass());
+ assertEquals("Copy as WIKI table (MockConfig)", menuItem.getText());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
