Bug fix: #1531 MySQL Plugin: SMALLINT UNSIGNED columns showed <Error> when the fields value exceeded 32767.

  Note: To work with MYSQL SMALLINT UNSIGNED or TINYINT UNSIGNED types the MySQL Plugin must be installed.

Author: gerdwagner

sql12/core/doc/changes.txt

@@ -74,6 +74,9 @@ Table cell data popup now offers find, Xml/Json-reformatting and export function
 
 Bug fixes:
 
+#1531 MySQL Plugin: SMALLINT UNSIGNED columns showed <Error> when the fields value exceeded 32767.
+  Note: To work with MYSQL SMALLINT UNSIGNED or TINYINT UNSIGNED types the MySQL Plugin must be installed.
+
 SQL editor/SQL result tabs/marking SQL result tab headers:
   Memory and CPU usage was improved in case SQLs where compared
   disregarding comments line feeds and other white spaces.

sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.java

@@ -81,7 +81,9 @@
 import net.sourceforge.squirrel_sql.plugins.mysql.tab.UserGrantsTab;
 import net.sourceforge.squirrel_sql.plugins.mysql.tokenizer.MysqlQueryTokenizer;
 import net.sourceforge.squirrel_sql.plugins.mysql.types.MySQL5ByteTypeDataTypeComponentFactory;
+import net.sourceforge.squirrel_sql.plugins.mysql.types.MySQL5SmallIntTypeDataTypeComponentFactory;
 import net.sourceforge.squirrel_sql.plugins.mysql.types.MySQLByteTypeDataTypeComponentFactory;
+import net.sourceforge.squirrel_sql.plugins.mysql.types.MySQLSmallIntTypeDataTypeComponentFactory;
 
 import javax.swing.JMenu;
 
@@ -289,9 +291,12 @@ public synchronized void initialize() throws PluginException
 
       /* Register custom DataTypeComponent factory for MySQL TINYINT UNSIGNED type */
       Main.getApplication().getDataTypeComponentFactoryRegistry().registerDataTypeFactory(new MySQLByteTypeDataTypeComponentFactory());
-      /* Register custom DataTypeComponent factory for MySQL TINYINT UNSIGNED type */
       Main.getApplication().getDataTypeComponentFactoryRegistry().registerDataTypeFactory(new MySQL5ByteTypeDataTypeComponentFactory());
 
+      /* Register custom DataTypeComponent factory for MySQL SMALLINT UNSIGNED type */
+      Main.getApplication().getDataTypeComponentFactoryRegistry().registerDataTypeFactory(new MySQLSmallIntTypeDataTypeComponentFactory());
+      Main.getApplication().getDataTypeComponentFactoryRegistry().registerDataTypeFactory(new MySQL5SmallIntTypeDataTypeComponentFactory());
+
    }
 
 	/**

sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/MySQL5ByteTypeDataTypeComponentFactory.java

@@ -6,15 +6,15 @@
 /**
  * A factory that creates Data for rendering columns of
  * {@code DB2Types.XML}.
- * 
  */
-public class MySQL5ByteTypeDataTypeComponentFactory extends MySQLByteTypeDataTypeComponentFactory {
-
-	/**
-	 * @see net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponentFactory#getDialectType()
-	 */
-	public DialectType getDialectType() {
-		return DialectType.MYSQL5;
-	}
+public class MySQL5ByteTypeDataTypeComponentFactory extends MySQLByteTypeDataTypeComponentFactory
+{
 
+   /**
+    * @see net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponentFactory#getDialectType()
+    */
+   public DialectType getDialectType()
+   {
+      return DialectType.MYSQL5;
+   }
 }

sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/MySQL5SmallIntTypeDataTypeComponentFactory.java

@@ -0,0 +1,20 @@
+
+package net.sourceforge.squirrel_sql.plugins.mysql.types;
+
+import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
+
+/**
+ * A factory that creates Data for rendering columns of
+ * {@code DB2Types.XML}.
+ * 
+ */
+public class MySQL5SmallIntTypeDataTypeComponentFactory extends MySQLSmallIntTypeDataTypeComponentFactory {
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponentFactory#getDialectType()
+	 */
+	public DialectType getDialectType() {
+		return DialectType.MYSQL5;
+	}
+
+}

sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/MySQLByteTypeDataTypeComponentFactory.java

@@ -9,34 +9,30 @@
 
 /**
  * A factory that creates DataTypeShort for rendering columns of MySQL TINYINT UNSIGNED.
- * 
  */
-public class MySQLByteTypeDataTypeComponentFactory implements
-		IDataTypeComponentFactory {
+public class MySQLByteTypeDataTypeComponentFactory implements IDataTypeComponentFactory
+{
 
-	/**
-	 * @see net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponentFactory#constructDataTypeComponent()
-	 */
-	@Override
-	public IDataTypeComponent constructDataTypeComponent() {
-		return new DataTypeShort(null, new ColumnDisplayDefinition(10, "dummy"));
-	}
+   @Override
+   public IDataTypeComponent constructDataTypeComponent()
+   {
+      return new DataTypeShort(null, new ColumnDisplayDefinition(10, "dummy"));
+   }
 
-	/**
-	 * @see net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponentFactory#getDialectType()
-	 */
-	@Override
-	public DialectType getDialectType() {
-		return DialectType.MYSQL;
-	}
+   @Override
+   public DialectType getDialectType()
+   {
+      return DialectType.MYSQL;
+   }
 
-	
-	@Override
-	public boolean matches(DialectType dialectType, int sqlType,
-			String sqlTypeName) {
-		return new EqualsBuilder().append(getDialectType(), dialectType)
-				.append(-6, sqlType)
-				.append("TINYINT UNSIGNED", sqlTypeName).isEquals();
-	}
+
+   @Override
+   public boolean matches(DialectType dialectType, int sqlType,
+                          String sqlTypeName)
+   {
+      return new EqualsBuilder().append(getDialectType(), dialectType)
+                                .append(-6, sqlType)
+                                .append("TINYINT UNSIGNED", sqlTypeName).isEquals();
+   }
 
 }

sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/MySQLSmallIntTypeDataTypeComponentFactory.java

@@ -0,0 +1,44 @@
+package net.sourceforge.squirrel_sql.plugins.mysql.types;
+
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeInteger;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponentFactory;
+import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+/**
+ * A factory that creates DataTypeShort for rendering columns of MySQL SMALLINT UNSIGNED.
+ */
+public class MySQLSmallIntTypeDataTypeComponentFactory implements IDataTypeComponentFactory
+{
+
+   /**
+    * @see IDataTypeComponentFactory#constructDataTypeComponent()
+    */
+   @Override
+   public IDataTypeComponent constructDataTypeComponent()
+   {
+      return new DataTypeInteger(null, new ColumnDisplayDefinition(20, "dummy"));
+   }
+
+   /**
+    * @see IDataTypeComponentFactory#getDialectType()
+    */
+   @Override
+   public DialectType getDialectType()
+   {
+      return DialectType.MYSQL;
+   }
+
+
+   @Override
+   public boolean matches(DialectType dialectType, int sqlType,
+                          String sqlTypeName)
+   {
+      return new EqualsBuilder().append(getDialectType(), dialectType)
+                                .append(5, sqlType)
+                                .append("SMALLINT UNSIGNED", sqlTypeName).isEquals();
+   }
+
+}