| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "modules/webdatabase/sqlite/SQLiteStatement.h" | 26 #include "modules/webdatabase/sqlite/SQLiteStatement.h" |
| 27 | 27 |
| 28 #include <memory> |
| 28 #include "modules/webdatabase/sqlite/SQLLog.h" | 29 #include "modules/webdatabase/sqlite/SQLLog.h" |
| 29 #include "modules/webdatabase/sqlite/SQLValue.h" | 30 #include "modules/webdatabase/sqlite/SQLValue.h" |
| 30 #include "platform/heap/SafePoint.h" | 31 #include "platform/heap/SafePoint.h" |
| 32 #include "platform/wtf/Assertions.h" |
| 33 #include "platform/wtf/PtrUtil.h" |
| 34 #include "platform/wtf/text/CString.h" |
| 31 #include "third_party/sqlite/sqlite3.h" | 35 #include "third_party/sqlite/sqlite3.h" |
| 32 #include "wtf/Assertions.h" | |
| 33 #include "wtf/PtrUtil.h" | |
| 34 #include "wtf/text/CString.h" | |
| 35 #include <memory> | |
| 36 | 36 |
| 37 // SQLite 3.6.16 makes sqlite3_prepare_v2 automatically retry preparing the | 37 // SQLite 3.6.16 makes sqlite3_prepare_v2 automatically retry preparing the |
| 38 // statement once if the database scheme has changed. We rely on this behavior. | 38 // statement once if the database scheme has changed. We rely on this behavior. |
| 39 #if SQLITE_VERSION_NUMBER < 3006016 | 39 #if SQLITE_VERSION_NUMBER < 3006016 |
| 40 #error SQLite version 3.6.16 or newer is required | 40 #error SQLite version 3.6.16 or newer is required |
| 41 #endif | 41 #endif |
| 42 | 42 |
| 43 namespace { | 43 namespace { |
| 44 | 44 |
| 45 // Only return error codes consistent with 3.7.6.3. | 45 // Only return error codes consistent with 3.7.6.3. |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 ASSERT(col >= 0); | 292 ASSERT(col >= 0); |
| 293 if (!statement_) | 293 if (!statement_) |
| 294 if (PrepareAndStep() != SQLITE_ROW) | 294 if (PrepareAndStep() != SQLITE_ROW) |
| 295 return 0; | 295 return 0; |
| 296 if (ColumnCount() <= col) | 296 if (ColumnCount() <= col) |
| 297 return 0; | 297 return 0; |
| 298 return sqlite3_column_int64(statement_, col); | 298 return sqlite3_column_int64(statement_, col); |
| 299 } | 299 } |
| 300 | 300 |
| 301 } // namespace blink | 301 } // namespace blink |
| OLD | NEW |