ResultMetaData.java (hsqldb-2.6.0) | : | ResultMetaData.java (hsqldb-2.6.1) | ||
---|---|---|---|---|
skipping to change at line 50 | skipping to change at line 50 | |||
import org.hsqldb.rowio.RowInputInterface; | import org.hsqldb.rowio.RowInputInterface; | |||
import org.hsqldb.rowio.RowOutputInterface; | import org.hsqldb.rowio.RowOutputInterface; | |||
import org.hsqldb.types.ArrayType; | import org.hsqldb.types.ArrayType; | |||
import org.hsqldb.types.Type; | import org.hsqldb.types.Type; | |||
import org.hsqldb.types.Types; | import org.hsqldb.types.Types; | |||
/** | /** | |||
* Metadata for a result set. | * Metadata for a result set. | |||
* | * | |||
* @author Fred Toussi (fredt@users dot sourceforge.net) | * @author Fred Toussi (fredt@users dot sourceforge.net) | |||
* @version 2.6.0 | * @version 2.6.1 | |||
* @since 1.8.0 | * @since 1.8.0 | |||
*/ | */ | |||
public final class ResultMetaData { | public final class ResultMetaData { | |||
public static final int RESULT_METADATA = 1; | public static final int RESULT_METADATA = 1; | |||
public static final int SIMPLE_RESULT_METADATA = 2; | public static final int SIMPLE_RESULT_METADATA = 2; | |||
public static final int UPDATE_RESULT_METADATA = 3; | public static final int UPDATE_RESULT_METADATA = 3; | |||
public static final int PARAM_METADATA = 4; | public static final int PARAM_METADATA = 4; | |||
public static final int GENERATED_INDEX_METADATA = 5; | public static final int GENERATED_INDEX_METADATA = 5; | |||
public static final int GENERATED_NAME_METADATA = 6; | public static final int GENERATED_NAME_METADATA = 6; | |||
skipping to change at line 148 | skipping to change at line 148 | |||
ResultMetaData md = ResultMetaData.newResultMetaData(1); | ResultMetaData md = ResultMetaData.newResultMetaData(1); | |||
md.columns[0] = new ColumnBase(null, null, null, colName); | md.columns[0] = new ColumnBase(null, null, null, colName); | |||
md.columns[0].setType(Type.SQL_VARCHAR_DEFAULT); | md.columns[0].setType(Type.SQL_VARCHAR_DEFAULT); | |||
md.prepareData(); | md.prepareData(); | |||
return md; | return md; | |||
} | } | |||
public static ResultMetaData newDoubleColumnMetaData(String colNameA, | public static ResultMetaData newMetaData(String[] colNames, | |||
String colNameB) { | Type[] colTypes) { | |||
ResultMetaData md = ResultMetaData.newResultMetaData(2); | ResultMetaData md = newResultMetaData(colTypes, null, colTypes.length, | |||
colTypes.length); | ||||
md.columns[0] = new ColumnBase(null, null, null, colNameA); | for (int i = 0; i < colNames.length; i++) { | |||
ColumnBase col = new ColumnBase(null, null, null, colNames[i]); | ||||
md.columns[0].setType(Type.SQL_VARCHAR_DEFAULT); | col.setType(colTypes[i]); | |||
md.columns[1] = new ColumnBase(null, null, null, colNameB); | md.columns[i] = col; | |||
} | ||||
md.columns[1].setType(Type.SQL_VARCHAR_DEFAULT); | ||||
md.prepareData(); | md.prepareData(); | |||
return md; | return md; | |||
} | } | |||
public static ResultMetaData newResultMetaData(Type[] types, | public static ResultMetaData newResultMetaData(Type[] types, | |||
int[] baseColumnIndexes, int colCount, int extColCount) { | int[] baseColumnIndexes, int colCount, int extColCount) { | |||
ResultMetaData md = new ResultMetaData(RESULT_METADATA); | ResultMetaData md = new ResultMetaData(RESULT_METADATA); | |||
md.columnLabels = new String[colCount]; | md.columnLabels = new String[colCount]; | |||
md.columns = new ColumnBase[colCount]; | md.columns = new ColumnBase[colCount]; | |||
md.columnTypes = types; | md.columnTypes = types; | |||
md.colIndexes = baseColumnIndexes; | md.colIndexes = baseColumnIndexes; | |||
md.columnCount = colCount; | md.columnCount = colCount; | |||
End of changes. 8 change blocks. | ||||
9 lines changed or deleted | 10 lines changed or added |