| OLD | NEW |
| 1 Name: sqlite | 1 Name: sqlite |
| 2 License File: src/LICENSE | 2 License File: src/LICENSE |
| 3 URL: http://sqlite.org/ | 3 URL: http://sqlite.org/ |
| 4 Version: 3.6.18 | 4 Version: 3.6.18 |
| 5 Included In Release: Yes | 5 Included In Release: Yes |
| 6 Security Critical: Yes | 6 Security Critical: Yes |
| 7 | 7 |
| 8 Instructions for importing a new release of SQLite from sqlite.org. | 8 Instructions for importing a new release of SQLite from sqlite.org. |
| 9 | 9 |
| 10 Note: our current base version is 3.6.18. | 10 Note: our current base version is 3.6.18. |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 | 35 |
| 36 # Use kdiff3 to merge the changes: | 36 # Use kdiff3 to merge the changes: |
| 37 kdiff3 -m sqlite-$BASE sqlite-$LATEST sqlite | 37 kdiff3 -m sqlite-$BASE sqlite-$LATEST sqlite |
| 38 | 38 |
| 39 # Resolve any conflicts. Figure out if we've got everything we should | 39 # Resolve any conflicts. Figure out if we've got everything we should |
| 40 # have (see below), or if we can omit any changes we no longer need. | 40 # have (see below), or if we can omit any changes we no longer need. |
| 41 | 41 |
| 42 # Change to the sqlite directory: | 42 # Change to the sqlite directory: |
| 43 cd sqlite | 43 cd sqlite |
| 44 | 44 |
| 45 # Run the google_generate_preprocessed.sh script: | 45 # Run the google_generate_amalgamation.sh script: |
| 46 ./google_generate_preprocessed.sh | 46 ./google_generate_amalgamation.sh |
| 47 | 47 |
| 48 # Find a sucker. Send review. | 48 # Find a sucker. Send review. |
| 49 # TODO(shess) Describe an appropriate comment style. Seems like it | 49 # TODO(shess) Describe an appropriate comment style. Seems like it |
| 50 # should at least include the SQLite version number. | 50 # should at least include the SQLite version number. |
| 51 | 51 |
| 52 -------------------------------------------- | 52 -------------------------------------------- |
| 53 | 53 |
| 54 For reference, all of our local patches are also kept as .patch files in the | 54 For reference, all of our local patches are also kept as .patch files in the |
| 55 sqlite directory. Here is a list of the patches, in the order they should be | 55 sqlite directory. Here is a list of the patches, in the order they should be |
| 56 applied to a vanilla SQLite (of the version we currently have) to get, in | 56 applied to a vanilla SQLite (of the version we currently have) to get, in |
| 57 principle, exactly what is checked in: | 57 principle, exactly what is checked in: |
| 58 | 58 |
| 59 misc.patch | 59 misc.patch |
| 60 preload-cache.patch | 60 preload-cache.patch |
| 61 safe-tolower.patch | 61 safe-tolower.patch |
| 62 fts2.patch | 62 fts2.patch |
| 63 fts3.patch | 63 fts3.patch |
| 64 icu-regexp.patch | 64 icu-regexp.patch |
| 65 icu-shell.patch | 65 icu-shell.patch |
| 66 attach-integer.patch | 66 attach-integer.patch |
| 67 webdb.patch | 67 webdb.patch |
| 68 test.patch | 68 test.patch |
| 69 mac_time_machine.patch |
| 69 | 70 |
| 70 So, e.g. you could do this to apply all our patches to vanilla SQLite: | 71 So, e.g. you could do this to apply all our patches to vanilla SQLite: |
| 71 | 72 |
| 72 cd sqlite-$LATEST | 73 cd sqlite-$LATEST |
| 73 patch -p0 < ../sqlite/misc.patch | 74 patch -p0 < ../sqlite/misc.patch |
| 74 patch -p0 < ../sqlite/preload-cache.patch | 75 patch -p0 < ../sqlite/preload-cache.patch |
| 75 patch -p0 < ../sqlite/safe-tolower.patch | 76 patch -p0 < ../sqlite/safe-tolower.patch |
| 76 patch -p0 < ../sqlite/fts2.patch | 77 patch -p0 < ../sqlite/fts2.patch |
| 77 patch -p0 < ../sqlite/fts3.patch | 78 patch -p0 < ../sqlite/fts3.patch |
| 78 patch -p0 < ../sqlite/icu-regexp.patch | 79 patch -p0 < ../sqlite/icu-regexp.patch |
| 79 patch -p0 < ../sqlite/icu-shell.patch | 80 patch -p0 < ../sqlite/icu-shell.patch |
| 80 patch -p0 < ../sqlite/attach-integer.patch | 81 patch -p0 < ../sqlite/attach-integer.patch |
| 81 patch -p0 < ../sqlite/webdb.patch | 82 patch -p0 < ../sqlite/webdb.patch |
| 82 patch -p0 < ../sqlite/test.patch | 83 patch -p0 < ../sqlite/test.patch |
| 84 patch -p0 < ../sqlite/mac_time_machine.patch |
| 83 | 85 |
| 84 This will only be the case if all changes we make also update the corresponding | 86 This will only be the case if all changes we make also update the corresponding |
| 85 patch files. Therefore please remember to do that whenever you make a change! | 87 patch files. Therefore please remember to do that whenever you make a change! |
| 86 | 88 |
| 87 Descriptions of the changes we've made can be found at the bottom of this file. | 89 Descriptions of the changes we've made can be found at the bottom of this file. |
| 88 | 90 |
| 89 -------------------------------------------- | 91 -------------------------------------------- |
| 90 | 92 |
| 91 How to run the SQLite tests for the Chromium version of SQLite on Linux. | 93 How to run the SQLite tests for the Chromium version of SQLite on Linux. |
| 92 | 94 |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 os_unix.c, to allow Chromium's Posix VFS implementation in | 170 os_unix.c, to allow Chromium's Posix VFS implementation in |
| 169 WebKit/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp | 171 WebKit/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp |
| 170 to correctly implement the "unused file descriptors" logic in the | 172 to correctly implement the "unused file descriptors" logic in the |
| 171 xDlOpen() method. The new functions are | 173 xDlOpen() method. The new functions are |
| 172 chromium_sqlite3_get_reusable_file_handle(), | 174 chromium_sqlite3_get_reusable_file_handle(), |
| 173 chromium_sqlite3_update_reusable_file_handle() and | 175 chromium_sqlite3_update_reusable_file_handle() and |
| 174 chromium_sqlite3_destroy_reusable_file_handle(). Also, added the | 176 chromium_sqlite3_destroy_reusable_file_handle(). Also, added the |
| 175 chromium_sqlite3_fill_in_unix_sqlite3_file() function that calls | 177 chromium_sqlite3_fill_in_unix_sqlite3_file() function that calls |
| 176 fillInUnixFile(), which will be made static again as soon as a | 178 fillInUnixFile(), which will be made static again as soon as a |
| 177 WebKit patch using the new function lands. | 179 WebKit patch using the new function lands. |
| 180 - From mac_time_machine.patch: |
| 181 When __APPLE__ and when creating a -journal file, determine if the database |
| 182 for which the journal is being created has been excluded from being backed |
| 183 up using Apple's Time Machine and if so then also exclude the journal. These |
| 184 changes were all made in pager.c. In order to eliminate a symbol conflict |
| 185 with an Apple library after amalgamation it was also necessary to rename |
| 186 fts3_porter.c's 'cType' to 'vOrCType'. |
| OLD | NEW |