Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "journal_mode should be set only on non-memory databases"

Browse Source
This commit is contained in:
Vasu Nori
2010-06-21 10:46:29 -07:00
committed by Android (Google) Code Review
parent ab8aa51aa6 194897da94
commit 8208529cd7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/database/sqlite/SQLiteDatabase.java
View File

@@ -956,11 +956,14 @@ public class SQLiteDatabase extends SQLiteClosable {
}
sqliteDatabase.setPageSize(sBlockSize);
// set journal_mode to truncate
String s = DatabaseUtils.stringForQuery(sqliteDatabase, "PRAGMA journal_mode=TRUNCATE",
null);
if (!s.equalsIgnoreCase("TRUNCATE")) {
Log.e(TAG, "setting journal_mode to TRUNCATE failed");
// set journal_mode to truncate for non-memory databases
if (!path.equalsIgnoreCase(":memory:")) {
String s = DatabaseUtils.stringForQuery(sqliteDatabase, "PRAGMA journal_mode=TRUNCATE",
null);
if (!s.equalsIgnoreCase("TRUNCATE")) {
Log.e(TAG, "setting journal_mode to TRUNCATE failed for db: " + path +
" (on pragma set journal_mode, sqlite returned:" + s);
}
}
// add this database to the list of databases opened in this process