Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/278057
Change subject: Hygiene: add DbUtil.namesCsv
......................................................................
Hygiene: add DbUtil.namesCsv
Change-Id: Ia8b5be3d3e2ae6c0710c89d7b09bd2c00b169b55
---
M app/src/main/java/org/wikipedia/database/DbUtil.java
M
app/src/main/java/org/wikipedia/useroption/database/UserOptionContentProvider.java
2 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/57/278057/1
diff --git a/app/src/main/java/org/wikipedia/database/DbUtil.java
b/app/src/main/java/org/wikipedia/database/DbUtil.java
index f7f34a1..ed7e05c 100644
--- a/app/src/main/java/org/wikipedia/database/DbUtil.java
+++ b/app/src/main/java/org/wikipedia/database/DbUtil.java
@@ -1,5 +1,7 @@
package org.wikipedia.database;
+import android.text.TextUtils;
+
import org.wikipedia.database.column.Column;
import java.util.ArrayList;
@@ -7,6 +9,14 @@
import java.util.Collection;
public final class DbUtil {
+ public static String namesCsv(Column<?>... cols) {
+ return namesCsv(Arrays.asList(cols));
+ }
+
+ public static String namesCsv(Collection<? extends Column<?>> cols) {
+ return TextUtils.join(", ", names(cols));
+ }
+
public static String[] names(Column<?>... cols) {
return names(Arrays.asList(cols)).toArray(new String[cols.length]);
}
diff --git
a/app/src/main/java/org/wikipedia/useroption/database/UserOptionContentProvider.java
b/app/src/main/java/org/wikipedia/useroption/database/UserOptionContentProvider.java
index e42bb2d..ff2f281 100644
---
a/app/src/main/java/org/wikipedia/useroption/database/UserOptionContentProvider.java
+++
b/app/src/main/java/org/wikipedia/useroption/database/UserOptionContentProvider.java
@@ -23,7 +23,7 @@
+ "from (select :contentVals) as new "
+ "left join (select :idCol, :selectionCol from :tbl) as old on
new.:selectionCol = old.:selectionCol;")
.replaceAll(":tbl", BuildConfig.USER_OPTION_TABLE)
- .replaceAll(":cols", TextUtils.join(",",
DbUtil.names(Col.ALL)))
+ .replaceAll(":cols", DbUtil.namesCsv(Col.ALL))
.replaceAll(":idCol", Col.ID.getName())
.replaceAll("(\\S*):contentCols", TextUtils.join(",",
StringUtil.prefix("$1", DbUtil.names(Col.CONTENT))))
.replaceAll(":contentVals", TextUtils.join(",",
StringUtil.prefix("? as ", DbUtil.names(Col.CONTENT))))
--
To view, visit https://gerrit.wikimedia.org/r/278057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8b5be3d3e2ae6c0710c89d7b09bd2c00b169b55
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
