diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build.c | 4 | ||||
| -rw-r--r-- | src/sqliteInt.h | 4 | ||||
| -rw-r--r-- | src/util.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/build.c b/src/build.c index 6343da4f5..69717edd2 100644 --- a/src/build.c +++ b/src/build.c @@ -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 ){ diff --git a/src/sqliteInt.h b/src/sqliteInt.h index e5dd35246..ade7399d8 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -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 diff --git a/src/util.c b/src/util.c index 89e3e56f1..2d1c64ad1 100644 --- a/src/util.c +++ b/src/util.c @@ -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; } |