Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make it explicit that the CATEGORIES column is not for selecting from.

Browse Source 
Renamed the `Schema.AppMetadata.Categories.CATEGORIES` constant into the
`Schema.AppMetadata.ForWriting.Categories.CATEGORIES` constant. This is
to make it very clear that it is not for reading from the database.
This commit is contained in:
Peter Serwylo 2016-10-20 13:03:03 +11:00
parent 68f666685f
commit 354f0a9b53
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/fdroid/fdroid/data/App.java
View File

@ -503,7 +503,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
values.put(Cols.SUGGESTED_VERSION_CODE, suggestedVersionCode); values.put(Cols.SUGGESTED_VERSION_CODE, suggestedVersionCode);
values.put(Cols.UPSTREAM_VERSION_NAME, upstreamVersionName); values.put(Cols.UPSTREAM_VERSION_NAME, upstreamVersionName);
values.put(Cols.UPSTREAM_VERSION_CODE, upstreamVersionCode); values.put(Cols.UPSTREAM_VERSION_CODE, upstreamVersionCode);
values.put(Cols.Categories.CATEGORIES, Utils.serializeCommaSeparatedString(categories)); values.put(Cols.ForWriting.Categories.CATEGORIES, Utils.serializeCommaSeparatedString(categories));
values.put(Cols.ANTI_FEATURES, Utils.serializeCommaSeparatedString(antiFeatures)); values.put(Cols.ANTI_FEATURES, Utils.serializeCommaSeparatedString(antiFeatures));
values.put(Cols.REQUIREMENTS, Utils.serializeCommaSeparatedString(requirements)); values.put(Cols.REQUIREMENTS, Utils.serializeCommaSeparatedString(requirements));
values.put(Cols.IS_COMPATIBLE, compatible ? 1 : 0); values.put(Cols.IS_COMPATIBLE, compatible ? 1 : 0);

13
app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
View File

@ -310,9 +310,6 @@ public class AppProvider extends FDroidProvider {
case Cols._COUNT: case Cols._COUNT:
appendCountField(); appendCountField();
break; break;
case Cols.Categories.CATEGORIES:
appendCategoriesField();
break;
default: default:
appendField(field, getTableName()); appendField(field, getTableName());
break; break;
@ -341,10 +338,6 @@ public class AppProvider extends FDroidProvider {
appendField(fieldName, "suggestedApk", alias); appendField(fieldName, "suggestedApk", alias);
} }
private void appendCategoriesField() {
appendField("GROUP_CONCAT(" + CategoryTable.NAME + "." + CategoryTable.Cols.NAME + ")", null, Cols.Categories.CATEGORIES);
}
private void addInstalledAppVersionName() { private void addInstalledAppVersionName() {
addInstalledAppField( addInstalledAppField(
InstalledAppTable.Cols.VERSION_NAME, InstalledAppTable.Cols.VERSION_NAME,
@ -862,12 +855,12 @@ public class AppProvider extends FDroidProvider {
String[] categories = null; String[] categories = null;
boolean saveCategories = false; boolean saveCategories = false;
if (values.containsKey(Cols.Categories.CATEGORIES)) { if (values.containsKey(Cols.ForWriting.Categories.CATEGORIES)) {
// Hold onto these categories, so that after we have an ID to reference the newly inserted // Hold onto these categories, so that after we have an ID to reference the newly inserted
// app metadata we can then specify its categories. // app metadata we can then specify its categories.
saveCategories = true; saveCategories = true;
categories = Utils.parseCommaSeparatedString(values.getAsString(Cols.Categories.CATEGORIES)); categories = Utils.parseCommaSeparatedString(values.getAsString(Cols.ForWriting.Categories.CATEGORIES));
values.remove(Cols.Categories.CATEGORIES); values.remove(Cols.ForWriting.Categories.CATEGORIES);
} }
long appMetadataId = db().insertOrThrow(getTableName(), null, values); long appMetadataId = db().insertOrThrow(getTableName(), null, values);

13
app/src/main/java/org/fdroid/fdroid/data/Schema.java
View File

@ -158,8 +158,15 @@ public interface Schema {
String PACKAGE_NAME = "package_packageName"; String PACKAGE_NAME = "package_packageName";
} }
interface Categories { /**
String CATEGORIES = "categories_commaSeparatedCateogryNames"; * This is to make it explicit that you cannot request the {@link Categories#CATEGORIES}
* field when selecting app metadata from the database. It is only here for the purpose
* of inserting/updating apps.
*/
interface ForWriting {
interface Categories {
String CATEGORIES = "categories_commaSeparatedCateogryNames";
}
} }
/** /**
@ -189,7 +196,7 @@ public interface Schema {
ANTI_FEATURES, REQUIREMENTS, ICON_URL, ICON_URL_LARGE, ANTI_FEATURES, REQUIREMENTS, ICON_URL, ICON_URL_LARGE,
SUGGESTED_VERSION_CODE, SuggestedApk.VERSION_NAME, SUGGESTED_VERSION_CODE, SuggestedApk.VERSION_NAME,
InstalledApp.VERSION_CODE, InstalledApp.VERSION_NAME, InstalledApp.VERSION_CODE, InstalledApp.VERSION_NAME,
InstalledApp.SIGNATURE, Package.PACKAGE_NAME, Categories.CATEGORIES, InstalledApp.SIGNATURE, Package.PACKAGE_NAME,
}; };
} }
} }

6
app/src/main/java/org/fdroid/fdroid/data/TempAppProvider.java
View File

@ -161,10 +161,10 @@ public class TempAppProvider extends AppProvider {
// Package names for apps cannot change... // Package names for apps cannot change...
values.remove(Cols.Package.PACKAGE_NAME); values.remove(Cols.Package.PACKAGE_NAME);
if (values.containsKey(Cols.Categories.CATEGORIES)) { if (values.containsKey(Cols.ForWriting.Categories.CATEGORIES)) {
String[] categories = Utils.parseCommaSeparatedString(values.getAsString(Cols.Categories.CATEGORIES)); String[] categories = Utils.parseCommaSeparatedString(values.getAsString(Cols.ForWriting.Categories.CATEGORIES));
ensureCategories(categories, packageName, repoId); ensureCategories(categories, packageName, repoId);
values.remove(Cols.Categories.CATEGORIES); values.remove(Cols.ForWriting.Categories.CATEGORIES);
} }
int count = db().update(getTableName(), values, query.getSelection(), query.getArgs()); int count = db().update(getTableName(), values, query.getSelection(), query.getArgs());

2
app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java
View File

@ -154,7 +154,7 @@ public class CategoryProviderTest extends FDroidProviderTest {
private void insertAppWithCategory(String id, String name, String categories) { private void insertAppWithCategory(String id, String name, String categories) {
ContentValues values = new ContentValues(1); ContentValues values = new ContentValues(1);
values.put(Cols.Categories.CATEGORIES, categories); values.put(Cols.ForWriting.Categories.CATEGORIES, categories);
AppProviderTest.insertApp(contentResolver, context, id, name, values); AppProviderTest.insertApp(contentResolver, context, id, name, values);
} }
} }