Correct sqlite wrapper behavior on systems where wchar_t is UTF-32,

chrome/browser/history/url_database.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/history/url_database.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/string_util.h"
@@ skipping 27 matching lines @@
   // TODO(brettw): do something fancy here with encoding, etc.
   return gurl.spec();
 }
 
 // Convenience to fill a history::URLRow. Must be in sync with the fields in
 // kURLRowFields.
 void URLDatabase::FillURLRow(SQLStatement& s, history::URLRow* i) {
   DCHECK(i);
   i->id_ = s.column_int64(0);
   i->url_ = GURL(s.column_string(1));
-  i->title_ = s.column_string16(2);
+  i->title_ = s.column_wstring(2);
   i->visit_count_ = s.column_int(3);
   i->typed_count_ = s.column_int(4);
   i->last_visit_ = Time::FromInternalValue(s.column_int64(5));
   i->hidden_ = s.column_int(6) != 0;
   i->favicon_id_ = s.column_int64(7);
 }
 
 bool URLDatabase::GetURLRow(URLID url_id, URLRow* info) {
   // TODO(brettw) We need check for empty URLs to handle the case where
   // there are old URLs in the database that are empty that got in before
@@ skipping 173 matching lines @@
   results->clear();
   SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(),
       "SELECT" HISTORY_URL_ROW_FIELDS "FROM urls "
       "WHERE url >= ? AND url < ? AND hidden = 0 "
       "ORDER BY typed_count DESC, visit_count DESC, last_visit_time DESC "
       "LIMIT ?");
   if (!statement.is_valid())
     return;
 
   // We will find all strings between "prefix" and this string, which is prefix
-  // followed by the maximum character size.
-  std::wstring end_query(prefix);
-  end_query.push_back(std::numeric_limits<wchar_t>::max());
+  // followed by the maximum character size. Use 8-bit strings for everything
+  // so we can be sure sqlite is comparing everything in 8-bit mode. Otherwise,
+  // it will have to convert strings either to UTF-8 or UTF-16 for comparison.
+  std::string prefix_utf8(WideToUTF8(prefix));
+  std::string end_query(prefix_utf8);
+  end_query.push_back(std::numeric_limits<unsigned char>::max());
 
-  statement->bind_wstring(0, prefix);
-  statement->bind_wstring(1, end_query);
+  statement->bind_string(0, prefix_utf8);
+  statement->bind_string(1, end_query);
   statement->bind_int(2, static_cast<int>(max_results));
 
   while (statement->step() == SQLITE_ROW) {
     history::URLRow info;
     FillURLRow(*statement, &info);
     if (info.url().is_valid())
       results->push_back(info);
   }
 }
 
@@ skipping 132 matching lines @@
   std::wstring next_prefix = lower_prefix;
   next_prefix[next_prefix.size() - 1] =
       next_prefix[next_prefix.size() - 1] + 1;
   statement->bind_int64(0, keyword_id);
   statement->bind_wstring(1, lower_prefix);
   statement->bind_wstring(2, next_prefix);
   statement->bind_int(3, max_count);
 
   KeywordSearchTermVisit visit;
   while (statement->step() == SQLITE_ROW) {
-    visit.term = statement->column_string16(0);
+    visit.term = statement->column_wstring(0);
     visit.time = Time::FromInternalValue(statement->column_int64(1));
     matches->push_back(visit);
   }
 }
 
 bool URLDatabase::MigrateFromVersion11ToVersion12() {
   URLRow about_row;
   if (GetRowForURL(GURL("about:blank"), &about_row)) {
     about_row.set_favicon_id(0);
     return UpdateURLRow(about_row.id(), about_row);
@@ skipping 60 matching lines @@
 }
 
 void URLDatabase::CreateSupplimentaryURLIndices() {
   // Add a favicon index.  This is useful when we delete urls.
   sqlite3_exec(GetDB(), "CREATE INDEX urls_favicon_id_INDEX ON urls (favicon_id)",
                NULL, NULL, NULL);
 }
 
 }  // namespace history