diff options
| author | drh <drh@noemail.net> | 2016-01-01 13:25:06 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-01-01 13:25:06 +0000 |
| commit | 8de1d77c60af1fbac5cc7eb7eb84efa3e43a320b (patch) | |
| tree | b2968afbe57bd3f1d1305f5a2241f575cca3b909 /src/main.c | |
| parent | 173b60999eb7b2fda450df311e286539fcd2b854 (diff) | |
| parent | a660caf2f01c99ef48085c731e200b5a2fa575b5 (diff) | |
| download | sqlite-8de1d77c60af1fbac5cc7eb7eb84efa3e43a320b.tar.gz sqlite-8de1d77c60af1fbac5cc7eb7eb84efa3e43a320b.zip | |
Merge the latest enhancements from trunk.
FossilOrigin-Name: c0be246a740c8f33a7c07e1414688364dee56ece
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c index a2b0024bd..2652bfc5c 100644 --- a/src/main.c +++ b/src/main.c @@ -2850,9 +2850,9 @@ static int openDatabase( ** EVIDENCE-OF: R-52786-44878 SQLite defines three built-in collating ** functions: */ - createCollation(db, "BINARY", SQLITE_UTF8, 0, binCollFunc, 0); - createCollation(db, "BINARY", SQLITE_UTF16BE, 0, binCollFunc, 0); - createCollation(db, "BINARY", SQLITE_UTF16LE, 0, binCollFunc, 0); + createCollation(db, sqlite3StrBINARY, SQLITE_UTF8, 0, binCollFunc, 0); + createCollation(db, sqlite3StrBINARY, SQLITE_UTF16BE, 0, binCollFunc, 0); + createCollation(db, sqlite3StrBINARY, SQLITE_UTF16LE, 0, binCollFunc, 0); createCollation(db, "NOCASE", SQLITE_UTF8, 0, nocaseCollatingFunc, 0); createCollation(db, "RTRIM", SQLITE_UTF8, (void*)1, binCollFunc, 0); if( db->mallocFailed ){ @@ -2861,7 +2861,7 @@ static int openDatabase( /* EVIDENCE-OF: R-08308-17224 The default collating function for all ** strings is BINARY. */ - db->pDfltColl = sqlite3FindCollSeq(db, SQLITE_UTF8, "BINARY", 0); + db->pDfltColl = sqlite3FindCollSeq(db, SQLITE_UTF8, sqlite3StrBINARY, 0); assert( db->pDfltColl!=0 ); /* Parse the filename/URI argument. */ @@ -3361,7 +3361,7 @@ int sqlite3_table_column_metadata( primarykey = 1; } if( !zCollSeq ){ - zCollSeq = "BINARY"; + zCollSeq = sqlite3StrBINARY; } error_out: @@ -3969,4 +3969,3 @@ void sqlite3_snapshot_free(sqlite3_snapshot *pSnapshot){ sqlite3_free(pSnapshot); } #endif /* SQLITE_ENABLE_SNAPSHOT */ - |