diff options
| author | drh <drh@noemail.net> | 2009-05-11 20:53:28 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2009-05-11 20:53:28 +0000 |
| commit | c4a64facce89c5033fbfb308175a81975391c977 (patch) | |
| tree | 15c7eb5cd7bb0494085b3a107593094d19753764 /src/sqliteInt.h | |
| parent | aaac8b4e1bcd9d7e61d30ceb2ff0169c9e11a951 (diff) | |
| download | sqlite-c4a64facce89c5033fbfb308175a81975391c977.tar.gz sqlite-c4a64facce89c5033fbfb308175a81975391c977.zip | |
Rework the logic that generates a schema for tables created using
"CREATE TABLE ... AS SELECT ...". Instead of trying to copy the raw
datatype string from the right-hand side, just make the type one
of TEXT, INT, REAL, NUM, or nothing. This is much simpler than
trying to parse and quote datatype strings. Other minor
implifications to build.c are bundled with this change. (CVS 6626)
FossilOrigin-Name: 33cf83591e6e13875ef6ada5b8ac8ab07619d8bc
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index b5d786d73..fccccb656 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.869 2009/05/07 14:11:52 drh Exp $ +** @(#) $Id: sqliteInt.h,v 1.870 2009/05/11 20:53:29 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -2641,8 +2641,8 @@ void *sqlite3HexToBlob(sqlite3*, const char *z, int n); int sqlite3TwoPartName(Parse *, Token *, Token *, Token **); const char *sqlite3ErrStr(int); int sqlite3ReadSchema(Parse *pParse); -CollSeq *sqlite3FindCollSeq(sqlite3*,u8 enc, const char *,int,int); -CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char *zName, int nName); +CollSeq *sqlite3FindCollSeq(sqlite3*,u8 enc, const char*,int); +CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char*zName); CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr); Expr *sqlite3ExprSetColl(Parse *pParse, Expr *, Token *); int sqlite3CheckCollSeq(Parse *, CollSeq *); @@ -2680,7 +2680,7 @@ int sqlite3ResolveOrderGroupBy(Parse*, Select*, ExprList*, const char*); void sqlite3ColumnDefault(Vdbe *, Table *, int); void sqlite3AlterFinishAddColumn(Parse *, Token *); void sqlite3AlterBeginAddColumn(Parse *, SrcList *); -CollSeq *sqlite3GetCollSeq(sqlite3*, CollSeq *, const char *, int); +CollSeq *sqlite3GetCollSeq(sqlite3*, CollSeq *, const char*); char sqlite3AffinityType(const Token*); void sqlite3Analyze(Parse*, Token*, Token*); int sqlite3InvokeBusyHandler(BusyHandler*); |