Trim and not null

Author: tanin47

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ jobs:
           node-version: '22'
       - uses: browser-actions/setup-chrome@v2
         with:
-          chrome-version: '142'
+          chrome-version: '144'
           install-chromedriver: true
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
@@ -138,7 +138,7 @@ jobs:
           node-version: '22'
       - uses: browser-actions/setup-chrome@v2
         with:
-          chrome-version: '142'
+          chrome-version: '143'
           install-chromedriver: true
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
@@ -186,7 +186,7 @@ jobs:
           node-version: '22'
       - uses: browser-actions/setup-chrome@v2
         with:
-          chrome-version: '142'
+          chrome-version: '144'
           install-chromedriver: true
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

core/src/main/java/tanin/backdoor/core/BackdoorCoreServer.java

@@ -274,8 +274,9 @@ public FullSystem start() throws Exception {
         var primaryKeyFilters = json.asObject().get("primaryKeys").asArray().values().stream().map(s -> {
           var o = s.asObject();
           var value = o.get("value");
+          var operator = Filter.Operator.valueOf(o.get("operator").asString());
 
-          return new Filter(o.get("name").asString(), value.isNull() ? null : value.asString());
+          return new Filter(o.get("name").asString(), value.asString(), operator);
         }).toArray(Filter[]::new);
 
         try (var engine = makeEngine(database)) {
@@ -339,24 +340,25 @@ public FullSystem start() throws Exception {
         var primaryKeyFilters = json.asObject().get("primaryKeys").asArray().values().stream().map(s -> {
           var o = s.asObject();
           var value = o.get("value");
+          var operator = Filter.Operator.valueOf(o.get("operator").asString());
 
-          return new Filter(o.get("name").asString(), value.isNull() ? null : value.asString());
+          return new Filter(o.get("name").asString(), value.asString(), operator);
         }).toArray(Filter[]::new);
 
         try (var engine = makeEngine(database)) {
           var column = Arrays.stream(engine.getColumns(tableName)).filter(c -> c.name.equals(columnName)).findFirst().orElse(null);
-
-          var newSantiziedValue = setToNull ? null : newValue;
-          engine.update(tableName, column, newSantiziedValue, primaryKeyFilters);
           assert column != null;
+          var newSanitized = setToNull ? null : newValue;
+
+          engine.update(tableName, column, newSanitized, primaryKeyFilters);
           AtomicReference<JsonValue> newFetchedValue = new AtomicReference<>(Json.NULL);
           engine.select(
             tableName,
             column,
             Arrays.stream(primaryKeyFilters)
               .peek(p -> {
                 if (p.name.equals(columnName)) {
-                  p.value = newSantiziedValue;
+                  p.value = newSanitized;
                 }
               })
               .toArray(Filter[]::new),
@@ -434,8 +436,9 @@ public FullSystem start() throws Exception {
         var filters = json.asObject().get("filters").asArray().values().stream().map(s -> {
           var o = s.asObject();
           var value = o.get("value");
+          var operator = Filter.Operator.valueOf(o.get("operator").asString());
 
-          return new Filter(o.get("name").asString(), value.isNull() ? null : value.asString());
+          return new Filter(o.get("name").asString(), value.asString(), operator);
         }).toArray(Filter[]::new);
         var sorts = json.asObject().get("sorts").asArray().values().stream().map(s -> {
           var o = s.asObject();
@@ -554,8 +557,9 @@ public FullSystem start() throws Exception {
         var filters = json.asObject().get("filters").asArray().values().stream().map(s -> {
           var o = s.asObject();
           var value = o.get("value");
+          var operator = Filter.Operator.valueOf(o.get("operator").asString());
 
-          return new Filter(o.get("name").asString(), value.isNull() ? null : value.asString());
+          return new Filter(o.get("name").asString(), value.asString(), operator);
         }).toArray(Filter[]::new);
         var sorts = json.asObject().get("sorts").asArray().values().stream().map(s -> {
           var o = s.asObject();

core/src/main/java/tanin/backdoor/core/Filter.java

@@ -4,18 +4,27 @@
 import com.eclipsesource.json.JsonValue;
 
 public class Filter {
+  public enum Operator {
+    EQUAL,
+    IS_NULL,
+    IS_NOT_NULL
+  }
+
 
   public String name;
   public String value;
+  public Operator operator;
 
-  Filter(String name, String value) {
+  Filter(String name, String value, Operator operator) {
     this.name = name;
     this.value = value;
+    this.operator = operator;
   }
 
   public JsonValue toJson() {
     return Json.object()
       .add("name", name)
-      .add("value", value);
+      .add("value", value)
+      .add("operator", operator.toString());
   }
 }

core/src/main/java/tanin/backdoor/core/engine/Engine.java

@@ -154,10 +154,19 @@ public String makeWhereClause(Filter[] filters) {
       var clauses = Arrays
         .stream(filters)
         .map(s -> {
-          var value = s.value == null ? "NULL" : makeSqlLiteral(s.value);
-          var op = s.value == null ? "IS" : "=";
-
-          return makeSqlName(s.name) + " " + op + " " + value;
+          String operatorAndValue;
+
+          if (s.operator == Filter.Operator.IS_NULL) {
+            operatorAndValue = " IS NULL";
+          } else if (s.operator == Filter.Operator.IS_NOT_NULL) {
+            operatorAndValue = " IS NOT NULL";
+          } else if (s.operator == Filter.Operator.EQUAL) {
+            operatorAndValue = " = " + makeSqlLiteral(s.value);
+          } else {
+            throw new RuntimeException("Unknown operator: " + s.operator);
+          }
+
+          return makeSqlName(s.name) + " " + operatorAndValue;
         })
         .toArray(String[]::new);
       whereClause = " WHERE " + String.join(" AND ", clauses);

core/src/test/java/tanin/backdoor/postgres/TableTest.java

@@ -305,7 +305,7 @@ void deleteRow() throws InterruptedException {
   }
 
   @Test
-  void filterRow() throws InterruptedException {
+  void filterRowSpecificValue() throws InterruptedException {
     go("/");
     click(tid("database-item"));
     waitUntil(() -> assertEquals("loaded", elem(tid("database-item")).getDomAttribute("data-database-status")));
@@ -323,6 +323,43 @@ void filterRow() throws InterruptedException {
     waitUntil(() -> assertColumnValues("username", "test_user_2"));
   }
 
+  @Test
+  void filterRowNullAndNotNull() throws Exception {
+    try (var engine = server.engineProvider.createEngine(postgresConfig, null)) {
+      engine.connection.createStatement().execute(
+        """
+             INSERT INTO "user" (
+             id,
+             username,
+             password
+           ) VALUES (
+             '100',
+             'null-user',
+             NULL
+           )
+          """
+      );
+    }
+    go("/");
+    click(tid("database-item"));
+    waitUntil(() -> assertEquals("loaded", elem(tid("database-item")).getDomAttribute("data-database-status")));
+
+    click(tid("menu-items", "postgres", null, "menu-item-table", "user"));
+
+    waitUntil(() -> assertTrue(hasElem(tid("sheet-tab", "user"))));
+    waitUntil(() -> assertColumnValues("username", "test_user_1", "test_user_2", "test_user_3", "test_user_4", "null-user"));
+
+    click(tid("sheet-view-column-header", "password", null, "filter-button"));
+    click(tid("not-null-checkbox"));
+    click(tid("submit-button"));
+    waitUntil(() -> assertColumnValues("username", "test_user_1", "test_user_2", "test_user_3", "test_user_4"));
+
+    click(tid("sheet-view-column-header", "password", null, "filter-button"));
+    click(tid("null-checkbox"));
+    click(tid("submit-button"));
+    waitUntil(() -> assertColumnValues("username", "null-user"));
+  }
+
   @Test
   void sortRow() throws InterruptedException {
     go("/");

core/src/test/java/tanin/backdoor/ux/EditTest.java

@@ -36,6 +36,26 @@ void editToNullAndRevertField() throws InterruptedException {
     waitUntil(() -> assertEquals("new-password", elem(tid("sheet-column-value", "password")).getText().trim()));
   }
 
+  @Test
+  void trimValue() throws InterruptedException {
+    go("/");
+    click(tid("database-item"));
+    waitUntil(() -> assertEquals("loaded", elem(tid("database-item")).getDomAttribute("data-database-status")));
+
+    click(tid("menu-items", "postgres", null, "menu-item-table", "user"));
+
+    click(tid("sheet-column-value", "password", null, "edit-field-button"));
+    fill(tid("new-value"), "\n  \nnew-password\n   \n");
+    click(tid("trim-value-checkbox"));
+    click(tid("submit-button"));
+    waitUntil(() -> assertEquals(" \n  \nnew-password\n   ", elem(tid("sheet-column-value", "password")).getText()));
+
+    click(tid("sheet-column-value", "password", null, "edit-field-button"));
+    click(tid("trim-value-checkbox"));
+    click(tid("submit-button"));
+    waitUntil(() -> assertEquals("new-password", elem(tid("sheet-column-value", "password")).getText()));
+  }
+
   @Test
   void useNowTimestamp() throws Exception {
     try (var engine = server.engineProvider.createEngine(postgresConfig, null)) {

frontend/svelte/_edit_modal.svelte

@@ -17,6 +17,7 @@ let rowIndex_: number | null = null
 let currentValue: any
 let currentColumn: Column | null
 let setToNull: boolean = false
+let shouldTrim: boolean = true
 
 let isLoading = false
 let errors: string[] = []
@@ -45,7 +46,11 @@ export function open(value: any, column: Column, rowValues: any[], rowIndex: num
     .map((column, index) => {
       if (column.isPrimaryKey) {
         const value = rowValues[index];
-        return {name: column.name, value: value === null ? null : ('' + value)}
+        return {
+          name: column.name,
+          value: ('' + value),
+          operator: value === null ? 'IS NULL' : 'EQUAL'
+        }
       } else {
         return null
       }
@@ -86,7 +91,7 @@ async function submit() {
       table: sheet.name,
       primaryKeys,
       column: currentColumn!.name,
-      value: currentValue,
+      value: shouldTrim ? currentValue.trim() : currentValue,
       setToNull,
     })
 
@@ -165,15 +170,28 @@ async function submit() {
           autocorrect="off"
         ></textarea>
       </div>
-      {#if currentColumn && currentColumn.type === 'TIMESTAMP' && !setToNull}
-        <div
-          class="text-xs underline cursor-pointer text-neutral-content"
-          data-test-id="timestamp-now-button"
-          onclick={() => {
-            currentValue = new Date().toISOString()
-          }}
-        >Use the current timestamp
-        </div>
+      {#if !setToNull && currentColumn}
+        {#if currentColumn.type === 'TIMESTAMP'}
+          <div
+            class="text-xs underline cursor-pointer text-neutral-content"
+            data-test-id="timestamp-now-button"
+            onclick={() => {
+              currentValue = new Date().toISOString()
+            }}
+          >Use the current timestamp
+          </div>
+        {:else if currentColumn.type === 'STRING'}
+          <label class="flex gap-2 items-center cursor-pointer">
+            <input
+              data-test-id="trim-value-checkbox"
+              type="checkbox"
+              class="checkbox checkbox-xs"
+              bind:checked={shouldTrim}
+              disabled={isLoading}
+            />
+            <span class="text-xs">Trim whitespaces before updating</span>
+          </label>
+        {/if}
       {/if}
       <ErrorPanel {errors}/>
       <div class="flex items-center justify-between mt-2">