Merge pull request #4351 from nocodb/fix/formula-right

fix(nocodb): wrap the second argument in formula RIGHT
2 years ago · 97e7cda67f
2 changed files with 4 additions and 4 deletions
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/mysql.ts
@ -28,9 +28,9 @@ const mysql2 = {
  },
  RIGHT: (args: MapFnArgs) => {
    return args.knex.raw(
-      `SUBSTR(${args.fn(args.pt.arguments[0])},-${args.fn(
+      `SUBSTR(${args.fn(args.pt.arguments[0])}, -(${args.fn(
        args.pt.arguments[1]
-      )})${args.colAlias}`
+      )}))${args.colAlias}`
    );
  },
  MID: 'SUBSTR',
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/sqlite.ts
@ -47,9 +47,9 @@ const sqlite3 = {
  },
  RIGHT: (args: MapFnArgs) => {
    return args.knex.raw(
-      `SUBSTR(${args.fn(args.pt.arguments[0])},-${args.fn(
+      `SUBSTR(${args.fn(args.pt.arguments[0])},-(${args.fn(
        args.pt.arguments[1]
-      )})${args.colAlias}`
+      )}))${args.colAlias}`
    );
  },
  MID: 'SUBSTR',