diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/platform/sql/SQLiteDatabase.cpp | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/platform/sql/SQLiteDatabase.cpp')
| -rw-r--r-- | WebCore/platform/sql/SQLiteDatabase.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/WebCore/platform/sql/SQLiteDatabase.cpp b/WebCore/platform/sql/SQLiteDatabase.cpp index e16b04e..9a4e32a 100644 --- a/WebCore/platform/sql/SQLiteDatabase.cpp +++ b/WebCore/platform/sql/SQLiteDatabase.cpp @@ -29,6 +29,7 @@ #include "DatabaseAuthorizer.h" #include "Logging.h" +#include "SQLiteFileSystem.h" #include "SQLiteStatement.h" #include <sqlite3.h> @@ -60,9 +61,7 @@ bool SQLiteDatabase::open(const String& filename) { close(); - // SQLite expects a null terminator on its UTF-16 strings. - String path = filename; - m_lastError = sqlite3_open16(path.charactersWithNullTermination(), &m_db); + m_lastError = SQLiteFileSystem::openDatabase(filename, &m_db); if (m_lastError != SQLITE_OK) { LOG_ERROR("SQLite database failed to load from %s\nCause - %s", filename.ascii().data(), sqlite3_errmsg(m_db)); |