30 lines
2.0 KiB
Diff
30 lines
2.0 KiB
Diff
diff -Nru hsqldb/src/org/hsqldb/Table.java hsqldb-gil/src/org/hsqldb/Table.java
|
|
--- hsqldb/src/org/hsqldb/Table.java 2007-10-19 23:59:07.000000000 +0200
|
|
+++ hsqldb-gil/src/org/hsqldb/Table.java 2011-01-29 09:29:24.000000000 +0100
|
|
@@ -149,10 +149,10 @@
|
|
Constraint[] constraintList; // constrainst for the table
|
|
HsqlArrayList[] triggerLists; // array of trigger lists
|
|
private int[] colTypes; // fredt - types of columns
|
|
- private int[] colSizes; // fredt - copy of SIZE values for columns
|
|
+ int[] colSizes; // fredt - copy of SIZE values for columns
|
|
private int[] colScales; // fredt - copy of SCALE values for columns
|
|
private boolean[] colNullable; // fredt - modified copy of isNullable() values
|
|
- private Expression[] colDefaults; // fredt - expressions of DEFAULT values
|
|
+ Expression[] colDefaults; // fredt - expressions of DEFAULT values
|
|
private int[] defaultColumnMap; // fred - holding 0,1,2,3,...
|
|
private boolean hasDefaultValues; //fredt - shortcut for above
|
|
boolean sqlEnforceSize; // inherited from the database -
|
|
diff -Nru hsqldb/src/org/hsqldb/TableWorks.java hsqldb-gil/src/org/hsqldb/TableWorks.java
|
|
--- hsqldb/src/org/hsqldb/TableWorks.java 2007-01-14 06:48:16.000000000 +0100
|
|
+++ hsqldb-gil/src/org/hsqldb/TableWorks.java 2011-01-29 09:31:11.000000000 +0100
|
|
@@ -670,7 +670,8 @@
|
|
// default expressions can change
|
|
oldCol.setType(newCol);
|
|
oldCol.setDefaultExpression(newCol.getDefaultExpression());
|
|
- table.setColumnTypeVars(colIndex);
|
|
+ table.colSizes[colIndex] = oldCol.getSize();
|
|
+ table.colDefaults[colIndex] = oldCol.getDefaultExpression();
|
|
table.resetDefaultsFlag();
|
|
|
|
return;
|