Rename the Column.eType field to Column.eCType - with an extra "C".
FossilOrigin-Name: b9b0dcd5af072c22f2ce71cf9584b5b572fbcfbce6410a7d703b586adb8938ba
This commit is contained in:
+2
-2
@@ -1554,7 +1554,7 @@ void sqlite3AddColumn(Parse *pParse, Token sName, Token sType){
|
||||
/* If there is no type specified, columns have the default affinity
|
||||
** 'BLOB' with a default size of 4 bytes. */
|
||||
pCol->affinity = affinity;
|
||||
pCol->eType = eType;
|
||||
pCol->eCType = eType;
|
||||
pCol->szEst = szEst;
|
||||
#ifdef SQLITE_ENABLE_SORTER_REFERENCES
|
||||
if( affinity==SQLITE_AFF_BLOB ){
|
||||
@@ -1849,7 +1849,7 @@ void sqlite3AddPrimaryKey(
|
||||
}
|
||||
if( nTerm==1
|
||||
&& pCol
|
||||
&& pCol->eType==COLTYPE_INTEGER
|
||||
&& pCol->eCType==COLTYPE_INTEGER
|
||||
&& sortOrder!=SQLITE_SO_DESC
|
||||
){
|
||||
if( IN_RENAME_OBJECT && pList ){
|
||||
|
||||
+2
-2
@@ -2039,7 +2039,7 @@ struct Module {
|
||||
struct Column {
|
||||
char *zCnName; /* Name of this column */
|
||||
unsigned notNull :4; /* An OE_ code for handling a NOT NULL constraint */
|
||||
unsigned eType :4; /* One of the standard types */
|
||||
unsigned eCType :4; /* One of the standard types */
|
||||
char affinity; /* One of the SQLITE_AFF_... values */
|
||||
u8 szEst; /* Est size of value in this column. sizeof(INT)==1 */
|
||||
u8 hName; /* Column name hash for faster lookup */
|
||||
@@ -2047,7 +2047,7 @@ struct Column {
|
||||
u16 colFlags; /* Boolean properties. See COLFLAG_ defines below */
|
||||
};
|
||||
|
||||
/* Allowed values for Column.eType.
|
||||
/* Allowed values for Column.eCType.
|
||||
**
|
||||
** Values must match entries in the global constant arrays
|
||||
** sqlite3StdTypeLen[] and sqlite3StdType[]. Each value is one more
|
||||
|
||||
+3
-3
@@ -91,9 +91,9 @@ int sqlite3Strlen30(const char *z){
|
||||
char *sqlite3ColumnType(Column *pCol, char *zDflt){
|
||||
if( pCol->colFlags & COLFLAG_HASTYPE ){
|
||||
return pCol->zCnName + strlen(pCol->zCnName) + 1;
|
||||
}else if( pCol->eType ){
|
||||
assert( pCol->eType<=SQLITE_N_STDTYPE );
|
||||
return (char*)sqlite3StdType[pCol->eType-1];
|
||||
}else if( pCol->eCType ){
|
||||
assert( pCol->eCType<=SQLITE_N_STDTYPE );
|
||||
return (char*)sqlite3StdType[pCol->eCType-1];
|
||||
}else{
|
||||
return zDflt;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user