Change that might allow SQLite to build and work using the EBCDIC character

set.

FossilOrigin-Name: ef30e0352b3d4a29749cd0872c10e45a6649ec52

diff --git a/manifest b/manifest
index 6a57efd696000e28fb0ad996fd6506c6edb3bd86..de2a2bc27fec5377a847b0799ea5e1736efb9f1e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Size\sreduction\sand\sperformance\simprovement\sin\sthe\sLIKE\sand\sGLOB\soperators.
-D 2014-09-25T00:56:00.685
+C Change\sthat\smight\sallow\sSQLite\sto\sbuild\sand\swork\susing\sthe\sEBCDIC\scharacter\nset.
+D 2014-09-25T02:44:29.974
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -178,7 +178,7 @@ F src/btreeInt.h 9db0d303b203d18871dc9a1d78a3e1ae4d62c1ef
 F src/build.c bde83dd5cf812e310a7e5ad2846790a14745bef4
 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
 F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
-F src/ctime.c 16cd19215d9fd849ee2b7509b092f2e0bbd6a958
+F src/ctime.c bb434068b5308a857b181c2d204a320ff0d6c638
 F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
 F src/delete.c fae81cc2eb14b75267d4f47d3cfc9ae02aae726f
 F src/expr.c f32119248996680aa73c5c37bfdd42820804dc17
@@ -232,7 +232,7 @@ F src/shell.c dad23987c34faddb061a339da3e92e05ccc6935e
 F src/sqlite.h.in 8b018219ce988913e5977d5de9ab4beb33be23b6
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
-F src/sqliteInt.h ca777ba045b1849d36a44dee1c71c652ae915093
+F src/sqliteInt.h 5e09fe04f999223680801ddf8fbae6b60751d613
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
@@ -283,7 +283,7 @@ F src/test_vfs.c f84075a388527892ff184988f43b69ce69b8083c
 F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 22dded4283dc4b25422f6444cdcb8d6b1ea0b5ff
-F src/tokenize.c 3df63041994f55afeb168b463ec836e8f1c50e7c
+F src/tokenize.c cc9016e5007fc5e76789079616d2f26741bcc689
 F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
 F src/update.c 729f6f18fc27740591d085e1172cebe311144bf0
 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
@@ -1200,7 +1200,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 99323552c001bc9173eb2a44542234c8ef7a9845
-R 81650f65f515728b656a3f04c1aeaf34
+P b2c89ef49cd19b8031a8149a2dc47cea07dd04e0
+R 594413b3f59b58a61e72cebd73f880a5
 U drh
-Z 2d4294ecf245e95fb6c7da3803927f1a
+Z 19c5c0df4d171b8ce37674c647553165

diff --git a/manifest.uuid b/manifest.uuid
index e8ae266ea4c1c172235a82b065cf61ccc226ec1f..7b2fbde36ddeb015023560cfd94b1b73cab40a01 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b2c89ef49cd19b8031a8149a2dc47cea07dd04e0
\ No newline at end of file
+ef30e0352b3d4a29749cd0872c10e45a6649ec52
\ No newline at end of file

diff --git a/src/ctime.c b/src/ctime.c
index 6f7ac8fcba738f32bc76f48b5724d86e998162d2..82a2f352044804e44384fec0ddb932cf5190d433 100644 (file)
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -395,7 +395,7 @@ int sqlite3_compileoption_used(const char *zOptName){
   ** linear search is adequate.  No need for a binary search. */
   for(i=0; i<ArraySize(azCompileOpt); i++){
     if( sqlite3StrNICmp(zOptName, azCompileOpt[i], n)==0
-     && sqlite3CtypeMap[(unsigned char)azCompileOpt[i][n]]==0
+     && sqlite3IsIdChar((unsigned char)azCompileOpt[i][n])==0
     ){
       return 1;
     }

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 414f30b66cff10cbb595bee790ff5dd1859530d6..b7e4d071ac884b766e8a36eb6f5eb7dfabbf56ea 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2654,6 +2654,7 @@ struct AuthContext {
 ** Bitfield flags for P5 value in various opcodes.
 */
 #define OPFLAG_NCHANGE       0x01    /* Set to update db->nChange */
+#define OPFLAG_EPHEM         0x01    /* OP_Column: Ephemeral output is ok */
 #define OPFLAG_LASTROWID     0x02    /* Set to update db->lastRowid */
 #define OPFLAG_ISUPDATE      0x04    /* This OP_Insert is an sql UPDATE */
 #define OPFLAG_APPEND        0x08    /* This is likely to be an append */
@@ -2987,6 +2988,7 @@ int sqlite3CantopenError(int);
 # define sqlite3Isxdigit(x)  isxdigit((unsigned char)(x))
 # define sqlite3Tolower(x)   tolower((unsigned char)(x))
 #endif
+int sqlite3IsIdChar(u8);
 
 /*
 ** Internal function prototypes

diff --git a/src/tokenize.c b/src/tokenize.c
index 8a7894514cda4a8a48fa61d958937c745b5d7e4f..5bb91554606c1830639e352d2be453fd4b235585 100644 (file)
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -102,6 +102,7 @@ const char sqlite3IsEbcdicIdChar[] = {
 };
 #define IdChar(C)  (((c=C)>=0x42 && sqlite3IsEbcdicIdChar[c-0x40]))
 #endif
+int sqlite3IsIdChar(u8 c){ return IdChar(c); }
 
 
 /*