Preserve allow.list ordering on save

config/dev.yml

@@ -100,7 +100,7 @@ database:
 
   # Define defaults to for the field key and values below
   defaults:
-    # filter: ["{ user_id: { eq: $user_id } }"]
+    # filters: ["{ user_id: { eq: $user_id } }"]
 
     # Field and table names that you wish to block
     blocklist:
@@ -112,17 +112,6 @@ database:
       - token
 
 tables:
-  - name: users
-    # This filter will overwrite defaults.filter
-    # filter: ["{ id: { eq: $user_id } }"]
-
-  # - name: products
-  #   # Multiple filters are AND'd together
-  #   filter: [
-  #     "{ price: { gt: 0 } }",
-  #     "{ price: { lt: 8 } }"
-  #   ]
-
   - name: customers
     remotes:
       - name: payments
@@ -168,24 +157,23 @@ roles:
     tables:
       - name: users
         query:
-          filter: ["{ id: { _eq: $user_id } }"]
+          filters: ["{ id: { _eq: $user_id } }"]
 
       - name: products
-
         query:
           limit: 50
-          filter: ["{ user_id: { eq: $user_id } }"]
+          filters: ["{ user_id: { eq: $user_id } }"]
           columns: ["id", "name", "description" ]
           disable_aggregation: false
 
         insert:
-          filter: ["{ user_id: { eq: $user_id } }"]
+          filters: ["{ user_id: { eq: $user_id } }"]
           columns: ["id", "name", "description" ]
           set:
-          - created_at: "now"
+            - created_at: "now"
             
         update:
-          filter: ["{ user_id: { eq: $user_id } }"]
+          filters: ["{ user_id: { eq: $user_id } }"]
           columns:
             - id
             - name
@@ -199,6 +187,5 @@ roles:
     match: id = 1
     tables:
       - name: users
-        
-        # select:
-        #   filter: ["{ account_id: { _eq: $account_id } }"]
+        # query:
+        #   filters: ["{ account_id: { _eq: $account_id } }"]

config/prod.yml

@@ -90,7 +90,7 @@ database:
 
   # Define defaults to for the field key and values below
   defaults:
-    filter: ["{ user_id: { eq: $user_id } }"]
+    filters: ["{ user_id: { eq: $user_id } }"]
     
     # Field and table names that you wish to block
     blocklist:
@@ -102,25 +102,7 @@ database:
       - token
 
 tables:
-  - name: users
-    # This filter will overwrite defaults.filter
-    # filter: ["{ id: { eq: $user_id } }"]
-    # filter_query: ["{ id: { eq: $user_id } }"]
-    filter_update: ["{ id: { eq: $user_id } }"]
-    filter_delete: ["{ id: { eq: $user_id } }"]
-
-  - name: products
-    # Multiple filters are AND'd together
-    filter: [
-      "{ price: { gt: 0 } }",
-      "{ price: { lt: 8 } }"
-    ] 
-
   - name: customers
-    # No filter is used for this field not 
-    # even defaults.filter
-    filter: none
-
     # remotes:
     #   - name: payments
     #     id: stripe_id
@@ -137,7 +119,61 @@ tables:
     # real db table backing them
     name: me
     table: users
-    filter: ["{ id: { eq: $user_id } }"]
 
-  # - name: posts
-  #   filter: ["{ account_id: { _eq: $account_id } }"]
+roles_query: "SELECT * FROM users as usr WHERE id = $user_id"
+
+roles:
+  - name: anon
+    tables:
+      - name: products
+        limit: 10
+
+        query:
+          columns: ["id", "name", "description" ]
+          aggregation: false
+
+        insert:
+          allow: false
+            
+        update:
+          allow: false
+
+        delete:
+          allow: false
+
+  - name: user
+    tables:
+      - name: users
+        query:
+          filters: ["{ id: { _eq: $user_id } }"]
+
+      - name: products
+        query:
+          limit: 50
+          filters: ["{ user_id: { eq: $user_id } }"]
+          columns: ["id", "name", "description" ]
+          disable_aggregation: false
+
+        insert:
+          filters: ["{ user_id: { eq: $user_id } }"]
+          columns: ["id", "name", "description" ]
+          set:
+            - created_at: "now"
+            
+        update:
+          filters: ["{ user_id: { eq: $user_id } }"]
+          columns:
+            - id
+            - name
+          set:
+            - updated_at: "now"
+
+        delete:
+          deny: true
+
+  - name: admin
+    match: id = 1
+    tables:
+      - name: users
+        # query:
+        #   filters: ["{ account_id: { _eq: $account_id } }"]