sql: Remove const qualifier from Statement::Column*() methods.
The sql::Statement::Column*() methods are currently const, which
suggests no internal state changes.
This is incorrect for the following reasons.
1. GetColumnType()'s comment indicates that Column*() perform SQLite
type conversion. So, the methods appear to change the underlying
SQLite state.
2. In general, the methods call into SQLite, and we can't guarantee that
SQLite state doesn't change.
This CL fixes the problem by removing the const qualifier from the
impacted methods.
Bug: 1229420
Change-Id: Id7a22d334130efb482455383e9ee6d0ee8400b2a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3028806
Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Auto-Submit: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#901938}
diff --git a/sql/statement.h b/sql/statement.h
index c664ab8..91871fc 100644
--- a/sql/statement.h
+++ b/sql/statement.h
@@ -162,15 +162,15 @@
// "type conversion." This means requesting the value of a column of a type
// where that type is not the native type. For safety, call ColumnType only
// on a column before getting the value out in any way.
- ColumnType GetColumnType(int col) const;
+ ColumnType GetColumnType(int col);
// These all take a 0-based argument index.
- bool ColumnBool(int column_index) const;
- int ColumnInt(int column_index) const;
- int64_t ColumnInt64(int column_index) const;
- double ColumnDouble(int column_index) const;
- std::string ColumnString(int column_index) const;
- std::u16string ColumnString16(int column_index) const;
+ bool ColumnBool(int column_index);
+ int ColumnInt(int column_index);
+ int64_t ColumnInt64(int column_index);
+ double ColumnDouble(int column_index);
+ std::string ColumnString(int column_index);
+ std::u16string ColumnString16(int column_index);
// Conforms with base::Time serialization recommendations.
//
@@ -181,16 +181,16 @@
//
// TODO(crbug.com/1195962): Migrate all time serialization to this method, and
// then remove the migration details above.
- base::Time ColumnTime(int column_index) const;
+ base::Time ColumnTime(int column_index);
// When reading a blob, you can get a raw pointer to the underlying data,
// along with the length, or you can just ask us to copy the blob into a
// vector. Danger! ColumnBlob may return nullptr if there is no data!
- int ColumnByteLength(int column_index) const;
- const void* ColumnBlob(int column_index) const;
- bool ColumnBlobAsString(int column_index, std::string* result) const;
- bool ColumnBlobAsVector(int column_index, std::vector<char>* result) const;
- bool ColumnBlobAsVector(int column_index, std::vector<uint8_t>* result) const;
+ int ColumnByteLength(int column_index);
+ const void* ColumnBlob(int column_index);
+ bool ColumnBlobAsString(int column_index, std::string* result);
+ bool ColumnBlobAsVector(int column_index, std::vector<char>* result);
+ bool ColumnBlobAsVector(int column_index, std::vector<uint8_t>* result);
// Diagnostics --------------------------------------------------------------
