hsqldb/patches/accumulated_patches.patch

   1 --- misc/hsqldb/src/org/hsqldb/Expression.java  2008-05-27 17:15:05.000000000 +0200
   2 +++ misc/build/hsqldb/src/org/hsqldb/Expression.java    2009-01-27 11:42:16.890625000 +0100
   3 @@ -803,61 +803,62 @@
   4
   5              case EXISTS :
   6                  buf.append(' ').append(Token.T_EXISTS).append(' ');
   7 -                break;
   8 +
   9 +                return buf.toString();
  10
  11              case COUNT :
  12                  buf.append(' ').append(Token.T_COUNT).append('(');
  13 -                break;
  14 +                return buf.toString();
  15
  16              case SUM :
  17                  buf.append(' ').append(Token.T_SUM).append('(');
  18                  buf.append(left).append(')');
  19 -                break;
  20 +                return buf.toString();
  21
  22              case MIN :
  23                  buf.append(' ').append(Token.T_MIN).append('(');
  24                  buf.append(left).append(')');
  25 -                break;
  26 +                return buf.toString();
  27
  28              case MAX :
  29                  buf.append(' ').append(Token.T_MAX).append('(');
  30                  buf.append(left).append(')');
  31 -                break;
  32 +                return buf.toString();
  33
  34              case AVG :
  35                  buf.append(' ').append(Token.T_AVG).append('(');
  36                  buf.append(left).append(')');
  37 -                break;
  38 +                return buf.toString();
  39
  40              case EVERY :
  41                  buf.append(' ').append(Token.T_EVERY).append('(');
  42                  buf.append(left).append(')');
  43 -                break;
  44 +                return buf.toString();
  45
  46              case SOME :
  47                  buf.append(' ').append(Token.T_SOME).append('(');
  48                  buf.append(left).append(')');
  49 -                break;
  50 +                return buf.toString();
  51
  52              case STDDEV_POP :
  53                  buf.append(' ').append(Token.T_STDDEV_POP).append('(');
  54                  buf.append(left).append(')');
  55 -                break;
  56 +                return buf.toString();
  57
  58              case STDDEV_SAMP :
  59                  buf.append(' ').append(Token.T_STDDEV_SAMP).append('(');
  60                  buf.append(left).append(')');
  61 -                break;
  62 +                return buf.toString();
  63
  64              case VAR_POP :
  65                  buf.append(' ').append(Token.T_VAR_POP).append('(');
  66                  buf.append(left).append(')');
  67 -                break;
  68 +                return buf.toString();
  69
  70              case VAR_SAMP :
  71                  buf.append(' ').append(Token.T_VAR_SAMP).append('(');
  72                  buf.append(left).append(')');
  73 -                break;
  74 +                return buf.toString();
  75          }
  76
  77          throw Trace.error(Trace.EXPRESSION_NOT_SUPPORTED);
  78 @@ -1522,6 +1523,16 @@
  79          if (exprType == COLUMN) {
  80              return columnName;
  81          }
  82 +        if ( isAggregate(exprType) )
  83 +        {
  84 +            try
  85 +            {
  86 +                return getDDL();
  87 +            }
  88 +            catch(Exception e)
  89 +            {
  90 +            }
  91 +        }
  92
  93          return "";
  94      }
  95 --- misc/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java      2008-03-17 17:05:41.000000000 +0100
  96 +++ misc/build/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java        2009-01-21 13:09:24.493470142 +0100
  97 @@ -429,6 +429,7 @@
  98              setProperty(hsqldb_log_size, 10);
  99              setProperty(sql_enforce_strict_size, true);
 100              setProperty(hsqldb_nio_data_file, false);
 101 +                       setProperty(hsqldb_lock_file, true);
 102          }
 103
 104          // OOo end
 105 --- misc/hsqldb/src/org/hsqldb/Library.java
 106 +++ misc/build/hsqldb/src/org/hsqldb/Library.java
 107 @@ -1957,7 +1957,7 @@
 108          functionMap.put("bitand", bitand);
 109          functionMap.put("bitlength", bitLength);
 110          functionMap.put("bitor", bitor);
 111 -        functionMap.put("bitxor", bitor);
 112 +        functionMap.put("bitxor", bitxor);
 113          functionMap.put("character", character);
 114          functionMap.put("concat", concat);
 115          functionMap.put("cot", cot);