mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-18 23:11:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix DB upgrade routine for virtual table

Browse source
This commit is contained in:
AndyScherzinger 2017-05-12 13:21:03 +02:00
parent 9a88f547f4
commit 28e8eaa376
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/owncloud/android/providers/FileContentProvider.java
View file

@ -908,7 +908,7 @@ public class FileContentProvider extends ContentProvider {
} }
if (oldVersion < 16 && newVersion >= 16) { if (oldVersion < 16 && newVersion >= 16) {
Log_OC.i("SQL", "Entering in the #16 ADD synced folders table"); Log_OC.i(SQL, "Entering in the #16 ADD synced folders table");
db.beginTransaction(); db.beginTransaction();
try { try {
// Create synced folders table // Create synced folders table
@ -925,7 +925,7 @@ public class FileContentProvider extends ContentProvider {
} }
if (oldVersion < 17 && newVersion >= 17) { if (oldVersion < 17 && newVersion >= 17) {
Log_OC.i(SQL, "Entering in the #4 ADD in onUpgrade"); Log_OC.i(SQL, "Entering in the #17 ADD in onUpgrade");
db.beginTransaction(); db.beginTransaction();
try { try {
db.execSQL(ALTER_TABLE + ProviderTableMeta.FILE_TABLE_NAME + db.execSQL(ALTER_TABLE + ProviderTableMeta.FILE_TABLE_NAME +
@ -945,7 +945,7 @@ public class FileContentProvider extends ContentProvider {
} }
if (oldVersion < 18 && newVersion >= 18) { if (oldVersion < 18 && newVersion >= 18) {
Log_OC.i(SQL, "Adding external link column to capabilities"); Log_OC.i(SQL, "Entering in the #18 Adding external link column to capabilities");
db.beginTransaction(); db.beginTransaction();
try { try {
db.execSQL(ALTER_TABLE + ProviderTableMeta.CAPABILITIES_TABLE_NAME + db.execSQL(ALTER_TABLE + ProviderTableMeta.CAPABILITIES_TABLE_NAME +
@ -964,7 +964,7 @@ public class FileContentProvider extends ContentProvider {
} }
if (oldVersion < 19 && newVersion >= 19) { if (oldVersion < 19 && newVersion >= 19) {
Log_OC.i(SQL, "Adding external link column to capabilities"); Log_OC.i(SQL, "Entering in the #19 Adding external link column to capabilities");
db.beginTransaction(); db.beginTransaction();
try { try {
createExternalLinksTable(db); createExternalLinksTable(db);
@ -980,17 +980,15 @@ public class FileContentProvider extends ContentProvider {
} }
if (oldVersion < 20 && newVersion >= 20) { if (oldVersion < 20 && newVersion >= 20) {
Log_OC.i(SQL, "Adding arbitrary data table"); Log_OC.i(SQL, "Entering in the #20 Adding arbitrary data table");
db.beginTransaction(); db.beginTransaction();
try { try {
createArbitraryData(db); createArbitraryData(db);
createVirtualTable(db);
upgraded = true; upgraded = true;
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {
db.endTransaction(); db.endTransaction();
} }
} }
if (!upgraded) { if (!upgraded) {
@ -998,7 +996,7 @@ public class FileContentProvider extends ContentProvider {
} }
if (oldVersion < 21 && newVersion >= 21) { if (oldVersion < 21 && newVersion >= 21) {
Log_OC.i(SQL, "Adding virtual table"); Log_OC.i(SQL, "Entering in the #21 Adding virtual table");
db.beginTransaction(); db.beginTransaction();
try { try {
createVirtualTable(db); createVirtualTable(db);