use compiled sql statements, use update for merge (#371)

apollographql · Mar 29, 2017 · ec1d31f · ec1d31f
1 parent bbf6ab3
commit ec1d31f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/...ime/src/androidTest/java/com/apollographql/android/cache/normalized/sql/SqlStoreTest.java b/...ime/src/androidTest/java/com/apollographql/android/cache/normalized/sql/SqlStoreTest.java
@@ -73,6 +73,17 @@ public void testRecordSelection_recordNotPresent() {
     assertThat(record).isNull();
   }
 
+  @Test
+  public void testRecordMerge() {
+    createRecord(STANDARD_KEY);
+    sqlStore.merge(Record.builder(STANDARD_KEY)
+        .addField("fieldKey", "valueUpdated")
+        .addField("newFieldKey", true).build());
+    Optional<Record> record = sqlStore.selectRecordForKey(STANDARD_KEY);
+    assertThat(record.get().fields().get("fieldKey")).isEqualTo("valueUpdated");
+    assertThat(record.get().fields().get("newFieldKey")).isEqualTo(true);
+  }
+
   private long createRecord(String key) {
     return sqlStore.createRecord(key, FIELDS);
   }

diff --git a/apollo-runtime/src/main/java/com/apollographql/android/cache/normalized/sql/SqlStore.java b/apollo-runtime/src/main/java/com/apollographql/android/cache/normalized/sql/SqlStore.java
@@ -1,8 +1,8 @@
 package com.apollographql.android.cache.normalized.sql;
 
+import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteStatement;
 
 import com.apollographql.android.api.graphql.internal.Optional;
 import com.apollographql.android.cache.normalized.CacheStore;
@@ -22,19 +22,12 @@
 import static com.apollographql.android.cache.normalized.sql.ApolloSqlHelper.TABLE_RECORDS;
 
 public final class SqlStore extends CacheStore {
-  private static final String INSERT_STATEMENT =
-      String.format("INSERT INTO %s (%s,%s) VALUES (?,?)",
-      TABLE_RECORDS,
-      COLUMN_KEY,
-      COLUMN_RECORD);
   SQLiteDatabase database;
   private final FieldsAdapter parser;
   private final ApolloSqlHelper dbHelper;
   private final String[] allColumns = {ApolloSqlHelper.COLUMN_ID,
       ApolloSqlHelper.COLUMN_KEY,
       ApolloSqlHelper.COLUMN_RECORD};
-  private final SQLiteStatement sqLiteStatement;
-
 
   public static SqlStore create(ApolloSqlHelper helper, FieldsAdapter adapter) {
     return new SqlStore(helper, adapter);
@@ -44,7 +37,6 @@ private SqlStore(ApolloSqlHelper dbHelper, FieldsAdapter parser) {
     this.dbHelper = dbHelper;
     database = dbHelper.getWritableDatabase();
     this.parser = parser;
-    sqLiteStatement = database.compileStatement(INSERT_STATEMENT);
   }
 
   @Nullable public Record loadRecord(String key) {
@@ -80,17 +72,23 @@ private SqlStore(ApolloSqlHelper dbHelper, FieldsAdapter parser) {
   }
 
   long createRecord(String key, String fields) {
-    sqLiteStatement.bindString(1, key);
-    sqLiteStatement.bindString(2, fields);
-
-    long recordId = sqLiteStatement.executeInsert();
+    ContentValues values = contentValuesForRecord(key, fields);
+    long recordId = database.insert(TABLE_RECORDS, null, values);
     return recordId;
   }
 
   void updateRecord(String key, String fields) {
-    sqLiteStatement.bindString(1, key);
-    sqLiteStatement.bindString(2, fields);
-    sqLiteStatement.executeUpdateDelete();
+    ContentValues values = contentValuesForRecord(key, fields);
+    String selection = COLUMN_KEY + " = ?";
+    String[] selectionArgs = new String[]{key};
+    database.update(TABLE_RECORDS, values, selection, selectionArgs);
+  }
+
+  private ContentValues contentValuesForRecord(String key, String fields) {
+    ContentValues values = new ContentValues(2);
+    values.put(COLUMN_KEY, key);
+    values.put(COLUMN_RECORD, fields);
+    return values;
   }
 
   Optional<Record> selectRecordForKey(String key) {