Merge branch 'develop' into map-marker-popups-for-shared-views

packages/nc-gui/components/smartsheet/Grid.vue

@@ -1056,7 +1056,7 @@ const closeAddColumnDropdown = () => {
     position: sticky !important;
     left: 80px;
     z-index: 5;
-    @apply border-r-1 border-r-gray-300;
+    @apply border-r-2 border-r-gray-300;
   }
 
   tbody td:nth-child(2) {
@@ -1064,7 +1064,7 @@ const closeAddColumnDropdown = () => {
     left: 80px;
     z-index: 4;
     background: white;
-    @apply shadow-lg border-r-1 border-r-gray-300;
+    @apply border-r-2 border-r-gray-300;
   }
 }
 

packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts

@@ -753,7 +753,7 @@ async function _formulaQueryBuilder(
           sql = `${sql} ${colAlias}`;
         }
       }
-      const query = knex.raw(sql);
+      const query = knex.raw(sql.replace(/\?/g, '\\?'));
       if (prevBinaryOp && pt.operator !== prevBinaryOp) {
         query.wrap('(', ')');
       }