From 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 11 Aug 2009 17:01:47 +0100 Subject: Merge in WebKit r47029. --- WebCore/platform/sql/SQLiteDatabase.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'WebCore/platform/sql/SQLiteDatabase.cpp') 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 @@ -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)); -- cgit v1.1