dsql.h (Firebird-3.0.2.32703-0.tar.bz2) | : | dsql.h (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 207 | skipping to change at line 207 | |||
{ | { | |||
public: | public: | |||
TypeClause(MemoryPool& pool, const Firebird::MetaName& aCollate) | TypeClause(MemoryPool& pool, const Firebird::MetaName& aCollate) | |||
: dtype(dtype_unknown), | : dtype(dtype_unknown), | |||
length(0), | length(0), | |||
scale(0), | scale(0), | |||
subType(0), | subType(0), | |||
segLength(0), | segLength(0), | |||
precision(0), | precision(0), | |||
charLength(0), | charLength(0), | |||
charSetId(0), | ||||
collationId(0), | collationId(0), | |||
textType(0), | textType(0), | |||
fullDomain(false), | fullDomain(false), | |||
notNull(false), | notNull(false), | |||
fieldSource(pool), | fieldSource(pool), | |||
typeOfTable(pool), | typeOfTable(pool), | |||
typeOfName(pool), | typeOfName(pool), | |||
collate(pool, aCollate), | collate(pool, aCollate), | |||
charSet(pool), | charSet(pool), | |||
subTypeName(pool, NULL), | subTypeName(pool, NULL), | |||
skipping to change at line 232 | skipping to change at line 231 | |||
ranges(NULL), | ranges(NULL), | |||
explicitCollation(false) | explicitCollation(false) | |||
{ | { | |||
} | } | |||
virtual ~TypeClause() | virtual ~TypeClause() | |||
{ | { | |||
} | } | |||
public: | public: | |||
void setExactPrecision() | ||||
{ | ||||
if (precision != 0) | ||||
return; | ||||
switch (dtype) | ||||
{ | ||||
case dtype_short: | ||||
precision = 4; | ||||
break; | ||||
case dtype_long: | ||||
precision = 9; | ||||
break; | ||||
case dtype_int64: | ||||
precision = 18; | ||||
break; | ||||
default: | ||||
fb_assert(!DTYPE_IS_EXACT(dtype)); | ||||
} | ||||
} | ||||
public: | ||||
USHORT dtype; | USHORT dtype; | |||
FLD_LENGTH length; | FLD_LENGTH length; | |||
SSHORT scale; | SSHORT scale; | |||
SSHORT subType; | SSHORT subType; | |||
USHORT segLength; // Segment length for blobs | USHORT segLength; // Segment length for blobs | |||
USHORT precision; // Precision for exact numeric types | USHORT precision; // Precision for exact numeric types | |||
USHORT charLength; // Length of fiel d in characters | USHORT charLength; // Length of fiel d in characters | |||
SSHORT charSetId; | Nullable<SSHORT> charSetId; | |||
SSHORT collationId; | SSHORT collationId; | |||
SSHORT textType; | SSHORT textType; | |||
bool fullDomain; // Domain name wi thout TYPE OF prefix | bool fullDomain; // Domain name wi thout TYPE OF prefix | |||
bool notNull; // NOT NULL was e xplicit specified | bool notNull; // NOT NULL was e xplicit specified | |||
Firebird::MetaName fieldSource; | Firebird::MetaName fieldSource; | |||
Firebird::MetaName typeOfTable; // TYPE OF table name | Firebird::MetaName typeOfTable; // TYPE OF table name | |||
Firebird::MetaName typeOfName; // TYPE OF | Firebird::MetaName typeOfName; // TYPE OF | |||
Firebird::MetaName collate; | Firebird::MetaName collate; | |||
Firebird::MetaName charSet; // empty means not specified | Firebird::MetaName charSet; // empty means not specified | |||
Firebird::MetaName subTypeName; // Subtype name for later resolution | Firebird::MetaName subTypeName; // Subtype name for later resolution | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 26 lines changed or added |