--no commit message

--no commit message

h2/src/main/org/h2/command/Parser.java

@@ -3201,7 +3201,7 @@ public class Parser {
                 readIf("CHAR");
                 if (dataType.supportsScale) {
                     if (readIf(",")) {
-                        scale = getPositiveInt();
+                        scale = getInt();
                         original += ", " + scale;
                     } else {
                         scale = 0;

h2/src/main/org/h2/util/MathUtils.java

@@ -66,7 +66,7 @@ public class MathUtils {
     public static BigDecimal setScale(BigDecimal bd, int scale) throws SQLException {
         if (scale > Constants.BIG_DECIMAL_SCALE_MAX) {
             throw Message.getInvalidValueException("" + scale, "scale");
-        } else if (scale < 0) {
+        } else if (scale < -Constants.BIG_DECIMAL_SCALE_MAX) {
             throw Message.getInvalidValueException("" + scale, "scale");
         }
         return bd.setScale(scale, BigDecimal.ROUND_HALF_UP);

h2/src/main/org/h2/util/StringUtils.java

@@ -46,6 +46,9 @@ public class StringUtils {
     }
 
     public static String quoteStringSQL(String s) {
+        if (s == null) {
+            return "NULL";
+        }
         StringBuffer buff = new StringBuffer(s.length() + 2);
         buff.append('\'');
         for (int i = 0; i < s.length(); i++) {

h2/src/test/org/h2/test/TestAll.java

@@ -160,6 +160,8 @@ java org.h2.test.TestAll timer
 
 /*
 
+create table test(d number(1, -84));
+
 MySQL:
 CREATE TABLE user (
  id int(25) NOT NULL auto_increment,
@@ -250,6 +252,8 @@ http://www.w3schools.com/sql/
 History:
 
 Roadmap:
+    Negative scale values for DECIMAL or NUMBER columns are not supported
+        in regular tables and in linked tables.
 
 */
         if (args.length > 0) {