提交 db870a95 authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov

Remove unused defaultDisplaySize parameter

上级 361f4701
...@@ -279,12 +279,12 @@ public class Mode { ...@@ -279,12 +279,12 @@ public class Mode {
// MS SQL Server does not support client info properties. See // MS SQL Server does not support client info properties. See
// https://msdn.microsoft.com/en-Us/library/dd571296%28v=sql.110%29.aspx // https://msdn.microsoft.com/en-Us/library/dd571296%28v=sql.110%29.aspx
mode.supportedClientInfoPropertiesRegEx = null; mode.supportedClientInfoPropertiesRegEx = null;
DataType dt = DataType.createDecimal(19, 19, 4, 21, false, false); DataType dt = DataType.createDecimal(19, 19, 4, false, false);
dt.type = Value.DECIMAL; dt.type = Value.DECIMAL;
dt.sqlType = Types.NUMERIC; dt.sqlType = Types.NUMERIC;
dt.name = "MONEY"; dt.name = "MONEY";
mode.typeByNameMap.put("MONEY", dt); mode.typeByNameMap.put("MONEY", dt);
dt = DataType.createDecimal(10, 10, 4, 12, false, false); dt = DataType.createDecimal(10, 10, 4, false, false);
dt.type = Value.DECIMAL; dt.type = Value.DECIMAL;
dt.sqlType = Types.NUMERIC; dt.sqlType = Types.NUMERIC;
dt.name = "SMALLMONEY"; dt.name = "SMALLMONEY";
...@@ -348,7 +348,7 @@ public class Mode { ...@@ -348,7 +348,7 @@ public class Mode {
disallowedTypes.add("TINYINT"); disallowedTypes.add("TINYINT");
disallowedTypes.add("BLOB"); disallowedTypes.add("BLOB");
mode.disallowedTypes = disallowedTypes; mode.disallowedTypes = disallowedTypes;
dt = DataType.createDecimal(19, 19, 2, 21, false, false); dt = DataType.createDecimal(19, 19, 2, false, false);
dt.type = Value.DECIMAL; dt.type = Value.DECIMAL;
dt.sqlType = Types.NUMERIC; dt.sqlType = Types.NUMERIC;
dt.name = "MONEY"; dt.name = "MONEY";
......
...@@ -198,37 +198,37 @@ public class DataType { ...@@ -198,37 +198,37 @@ public class DataType {
); );
add(Value.BOOLEAN, Types.BOOLEAN, add(Value.BOOLEAN, Types.BOOLEAN,
createDecimal(ValueBoolean.PRECISION, ValueBoolean.PRECISION, createDecimal(ValueBoolean.PRECISION, ValueBoolean.PRECISION,
0, ValueBoolean.DISPLAY_SIZE, false, false), 0, false, false),
new String[]{"BOOLEAN", "BIT", "BOOL"} new String[]{"BOOLEAN", "BIT", "BOOL"}
); );
add(Value.BYTE, Types.TINYINT, add(Value.BYTE, Types.TINYINT,
createDecimal(ValueByte.PRECISION, ValueByte.PRECISION, 0, createDecimal(ValueByte.PRECISION, ValueByte.PRECISION, 0,
ValueByte.DISPLAY_SIZE, false, false), false, false),
new String[]{"TINYINT"} new String[]{"TINYINT"}
); );
add(Value.SHORT, Types.SMALLINT, add(Value.SHORT, Types.SMALLINT,
createDecimal(ValueShort.PRECISION, ValueShort.PRECISION, 0, createDecimal(ValueShort.PRECISION, ValueShort.PRECISION, 0,
ValueShort.DISPLAY_SIZE, false, false), false, false),
new String[]{"SMALLINT", "YEAR", "INT2"} new String[]{"SMALLINT", "YEAR", "INT2"}
); );
add(Value.INT, Types.INTEGER, add(Value.INT, Types.INTEGER,
createDecimal(ValueInt.PRECISION, ValueInt.PRECISION, 0, createDecimal(ValueInt.PRECISION, ValueInt.PRECISION, 0,
ValueInt.DISPLAY_SIZE, false, false), false, false),
new String[]{"INTEGER", "INT", "MEDIUMINT", "INT4", "SIGNED"} new String[]{"INTEGER", "INT", "MEDIUMINT", "INT4", "SIGNED"}
); );
add(Value.INT, Types.INTEGER, add(Value.INT, Types.INTEGER,
createDecimal(ValueInt.PRECISION, ValueInt.PRECISION, 0, createDecimal(ValueInt.PRECISION, ValueInt.PRECISION, 0,
ValueInt.DISPLAY_SIZE, false, true), false, true),
new String[]{"SERIAL"} new String[]{"SERIAL"}
); );
add(Value.LONG, Types.BIGINT, add(Value.LONG, Types.BIGINT,
createDecimal(ValueLong.PRECISION, ValueLong.PRECISION, 0, createDecimal(ValueLong.PRECISION, ValueLong.PRECISION, 0,
ValueLong.DISPLAY_SIZE, false, false), false, false),
new String[]{"BIGINT", "INT8", "LONG"} new String[]{"BIGINT", "INT8", "LONG"}
); );
add(Value.LONG, Types.BIGINT, add(Value.LONG, Types.BIGINT,
createDecimal(ValueLong.PRECISION, ValueLong.PRECISION, 0, createDecimal(ValueLong.PRECISION, ValueLong.PRECISION, 0,
ValueLong.DISPLAY_SIZE, false, true), false, true),
new String[]{"IDENTITY", "BIGSERIAL"} new String[]{"IDENTITY", "BIGSERIAL"}
); );
if (SysProperties.BIG_DECIMAL_IS_DECIMAL) { if (SysProperties.BIG_DECIMAL_IS_DECIMAL) {
...@@ -240,17 +240,17 @@ public class DataType { ...@@ -240,17 +240,17 @@ public class DataType {
} }
add(Value.FLOAT, Types.REAL, add(Value.FLOAT, Types.REAL,
createDecimal(ValueFloat.PRECISION, ValueFloat.PRECISION, createDecimal(ValueFloat.PRECISION, ValueFloat.PRECISION,
0, ValueFloat.DISPLAY_SIZE, false, false), 0, false, false),
new String[] {"REAL", "FLOAT4"} new String[] {"REAL", "FLOAT4"}
); );
add(Value.DOUBLE, Types.DOUBLE, add(Value.DOUBLE, Types.DOUBLE,
createDecimal(ValueDouble.PRECISION, ValueDouble.PRECISION, createDecimal(ValueDouble.PRECISION, ValueDouble.PRECISION,
0, ValueDouble.DISPLAY_SIZE, false, false), 0, false, false),
new String[] { "DOUBLE", "DOUBLE PRECISION" } new String[] { "DOUBLE", "DOUBLE PRECISION" }
); );
add(Value.DOUBLE, Types.FLOAT, add(Value.DOUBLE, Types.FLOAT,
createDecimal(ValueDouble.PRECISION, ValueDouble.PRECISION, createDecimal(ValueDouble.PRECISION, ValueDouble.PRECISION,
0, ValueDouble.DISPLAY_SIZE, false, false), 0, false, false),
new String[] {"FLOAT", "FLOAT8" } new String[] {"FLOAT", "FLOAT8" }
); );
add(Value.TIME, Types.TIME, add(Value.TIME, Types.TIME,
...@@ -355,7 +355,7 @@ public class DataType { ...@@ -355,7 +355,7 @@ public class DataType {
createDecimal(Integer.MAX_VALUE, createDecimal(Integer.MAX_VALUE,
ValueDecimal.DEFAULT_PRECISION, ValueDecimal.DEFAULT_PRECISION,
ValueDecimal.DEFAULT_SCALE, ValueDecimal.DEFAULT_SCALE,
ValueDecimal.DEFAULT_DISPLAY_SIZE, true, false), true, false),
new String[]{"DECIMAL", "DEC"} new String[]{"DECIMAL", "DEC"}
); );
} }
...@@ -365,7 +365,7 @@ public class DataType { ...@@ -365,7 +365,7 @@ public class DataType {
createDecimal(Integer.MAX_VALUE, createDecimal(Integer.MAX_VALUE,
ValueDecimal.DEFAULT_PRECISION, ValueDecimal.DEFAULT_PRECISION,
ValueDecimal.DEFAULT_SCALE, ValueDecimal.DEFAULT_SCALE,
ValueDecimal.DEFAULT_DISPLAY_SIZE, true, false), true, false),
new String[]{"NUMERIC", "NUMBER"} new String[]{"NUMERIC", "NUMBER"}
); );
} }
...@@ -429,14 +429,13 @@ public class DataType { ...@@ -429,14 +429,13 @@ public class DataType {
* @param maxPrecision maximum supported precision * @param maxPrecision maximum supported precision
* @param defaultPrecision default precision * @param defaultPrecision default precision
* @param defaultScale default scale * @param defaultScale default scale
* @param defaultDisplaySize default display size
* @param needsPrecisionAndScale where precision and scale are supported * @param needsPrecisionAndScale where precision and scale are supported
* @param autoInc whether the data type is an auto-increment type * @param autoInc whether the data type is an auto-increment type
* @return data type * @return data type
*/ */
public static DataType createDecimal(int maxPrecision, public static DataType createDecimal(int maxPrecision,
int defaultPrecision, int defaultScale, int defaultDisplaySize, int defaultPrecision, int defaultScale, boolean needsPrecisionAndScale,
boolean needsPrecisionAndScale, boolean autoInc) { boolean autoInc) {
DataType dataType = new DataType(); DataType dataType = new DataType();
dataType.maxPrecision = maxPrecision; dataType.maxPrecision = maxPrecision;
dataType.defaultPrecision = defaultPrecision; dataType.defaultPrecision = defaultPrecision;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论