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

Merge pull request #2004 from nextcloud/fixDuplicateColumn

Browse source 
Catch error on duplicate column
This commit is contained in:
Andy Scherzinger 2018-01-19 14:46:37 +01:00 committed by GitHub
commit c9927cd7f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,7 @@ import android.content.UriMatcher;
import android.database.Cursor;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
@ -1644,8 +1645,12 @@ public class FileContentProvider extends ContentProvider {
}
if (!checkIfColumnExists(db, ProviderTableMeta.FILESYSTEM_TABLE_NAME,
ProviderTableMeta.FILESYSTEM_CRC32)) {
db.execSQL(ALTER_TABLE + ProviderTableMeta.FILESYSTEM_TABLE_NAME +
ADD_COLUMN + ProviderTableMeta.FILESYSTEM_CRC32 + " TEXT ");
try {
db.execSQL(ALTER_TABLE + ProviderTableMeta.FILESYSTEM_TABLE_NAME +
ADD_COLUMN + ProviderTableMeta.FILESYSTEM_CRC32 + " TEXT ");
} catch (SQLiteException e) {
Log_OC.d(TAG, "Known problem on adding same column twice when upgrading from 24->30");
}
}
upgraded = true;