Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
| Comment: | Remove surplus white space from shell.c. Use strlen30() instead of strlen(). (CVS 6346) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
324a1aff300b7349b9fc1dea56d640d8 |
| User & Date: | drh 2009-03-16 10:59:44 |
|
2009-03-16
| ||
| 12:30 | Bump the version number to 3.6.12. (CVS 6347) (check-in: 2fcccca3 user: drh tags: trunk) | |
| 10:59 | Remove surplus white space from shell.c. Use strlen30() instead of strlen(). (CVS 6346) (check-in: 324a1aff user: drh tags: trunk) | |
|
2009-03-14
| ||
| 08:37 | Fix for #3719. When synthesizing a CREATE TABLE statement as as result of a "CREATE TABLE AS", quote the column type names unless they are simple identifiers or simple identifiers followed by one or two dimensions (e.g. "VARCHAR(10)"). (CVS 6345) (check-in: 7c6437ef user: danielk1977 tags: trunk) | |
Changes to src/shell.c.
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 ... 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 ... 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 .... 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 .... 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 |
** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** ** $Id: shell.c,v 1.206 2009/03/13 15:32:53 danielk1977 Exp $ */ #if defined(_WIN32) || defined(WIN32) /* This needs to come before any includes for MSVC compiler */ #define _CRT_SECURE_NO_WARNINGS #endif #include <stdlib.h> ................................................................................ char **pzErr ){ int rc = SQLITE_NOMEM; schema_vtab *pVtab; SchemaTable *pType = &aSchemaTable[0]; UNUSED_PARAMETER(pzErr); if( argc>3 ){ int i; pType = 0; for(i=0; aSchemaTable[i].zName; i++){ if( 0==strcmp(argv[3], aSchemaTable[i].zName) ){ pType = &aSchemaTable[i]; } ................................................................................ int ii; char *zOut; char *zCsr; const char *zIn = (const char *)sqlite3_value_text(argv[0]); int nIn = sqlite3_value_bytes(argv[0]); UNUSED_PARAMETER(argc); zOut = sqlite3_malloc(nIn*2+3); zCsr = zOut; *zCsr++ = '"'; for(ii=0; ii<nIn; ii++){ *zCsr++ = zIn[ii]; if( zIn[ii]=='"' ){ *zCsr++ = '"'; ................................................................................ sqlite3_snprintf(sizeof(zQ2), zQ2, "%s ORDER BY rowid DESC", zQuery); rc = sqlite3_exec(p->db, zQ2, dump_callback, p, pzErrMsg); free(zQ2); } return rc; } #if !defined(SQLITE_OMIT_VIRTUALTABLE) && !defined(SQLITE_OMIT_SUBQUERY) struct GenfkeyCmd { sqlite3 *db; /* Database handle */ struct callback_data *pCb; /* Callback data */ int isIgnoreErrors; /* True for --ignore-errors */ int isExec; /* True for --exec */ int isNoDrop; /* True for --no-drop */ ................................................................................ typedef struct GenfkeyCmd GenfkeyCmd; static int genfkeyParseArgs(GenfkeyCmd *p, char **azArg, int nArg){ int ii; memset(p, 0, sizeof(GenfkeyCmd)); for(ii=0; ii<nArg; ii++){ size_t n = strlen(azArg[ii]); if( n>2 && n<10 && 0==strncmp(azArg[ii], "--no-drop", n) ){ p->isNoDrop = 1; }else if( n>2 && n<16 && 0==strncmp(azArg[ii], "--ignore-errors", n) ){ p->isIgnoreErrors = 1; }else if( n>2 && n<7 && 0==strncmp(azArg[ii], "--exec", n) ){ p->isExec = 1; |
| < < < | |
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 ... 249 250 251 252 253 254 255 256 257 258 259 260 261 262 ... 572 573 574 575 576 577 578 579 580 581 582 583 584 585 .... 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 .... 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 |
** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** ** $Id: shell.c,v 1.207 2009/03/16 10:59:44 drh Exp $ */ #if defined(_WIN32) || defined(WIN32) /* This needs to come before any includes for MSVC compiler */ #define _CRT_SECURE_NO_WARNINGS #endif #include <stdlib.h> ................................................................................ char **pzErr ){ int rc = SQLITE_NOMEM; schema_vtab *pVtab; SchemaTable *pType = &aSchemaTable[0]; UNUSED_PARAMETER(pzErr); if( argc>3 ){ int i; pType = 0; for(i=0; aSchemaTable[i].zName; i++){ if( 0==strcmp(argv[3], aSchemaTable[i].zName) ){ pType = &aSchemaTable[i]; } ................................................................................ int ii; char *zOut; char *zCsr; const char *zIn = (const char *)sqlite3_value_text(argv[0]); int nIn = sqlite3_value_bytes(argv[0]); UNUSED_PARAMETER(argc); zOut = sqlite3_malloc(nIn*2+3); zCsr = zOut; *zCsr++ = '"'; for(ii=0; ii<nIn; ii++){ *zCsr++ = zIn[ii]; if( zIn[ii]=='"' ){ *zCsr++ = '"'; ................................................................................ sqlite3_snprintf(sizeof(zQ2), zQ2, "%s ORDER BY rowid DESC", zQuery); rc = sqlite3_exec(p->db, zQ2, dump_callback, p, pzErrMsg); free(zQ2); } return rc; } #if !defined(SQLITE_OMIT_VIRTUALTABLE) && !defined(SQLITE_OMIT_SUBQUERY) struct GenfkeyCmd { sqlite3 *db; /* Database handle */ struct callback_data *pCb; /* Callback data */ int isIgnoreErrors; /* True for --ignore-errors */ int isExec; /* True for --exec */ int isNoDrop; /* True for --no-drop */ ................................................................................ typedef struct GenfkeyCmd GenfkeyCmd; static int genfkeyParseArgs(GenfkeyCmd *p, char **azArg, int nArg){ int ii; memset(p, 0, sizeof(GenfkeyCmd)); for(ii=0; ii<nArg; ii++){ int n = strlen30(azArg[ii]); if( n>2 && n<10 && 0==strncmp(azArg[ii], "--no-drop", n) ){ p->isNoDrop = 1; }else if( n>2 && n<16 && 0==strncmp(azArg[ii], "--ignore-errors", n) ){ p->isIgnoreErrors = 1; }else if( n>2 && n<7 && 0==strncmp(azArg[ii], "--exec", n) ){ p->isExec = 1; |