From 680bb82bea785bdefd20e7e12cd2c6f8d51d758a Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 31 Aug 2022 21:28:38 +0530
Subject: [PATCH 1/3] test: enable screenshots

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 scripts/cypress-v2/cypress.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/cypress-v2/cypress.json b/scripts/cypress-v2/cypress.json
index fc61d497d9..cca71b1952 100644
--- a/scripts/cypress-v2/cypress.json
+++ b/scripts/cypress-v2/cypress.json
@@ -19,9 +19,9 @@
     "pageLoadTimeout": 600000,
     "viewportWidth": 1980,
     "viewportHeight": 1000,
-    "video": false,
+    "video": true,
     "retries": 0,
-    "screenshotOnRunFailure": false,
+    "screenshotOnRunFailure": true,
     "numTestsKeptInMemory": 0,
     "experimentalInteractiveRunEvents": true,
     "env": {

From e581a2396e0cdcce896fd73f48b059003bc67563 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 31 Aug 2022 22:22:43 +0530
Subject: [PATCH 2/3] test: xcdb- wait till project creation is complete

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 scripts/cypress-v2/integration/common/00_pre_configurations.js | 1 +
 scripts/cypress-v2/support/page_objects/navigation.js          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/cypress-v2/integration/common/00_pre_configurations.js b/scripts/cypress-v2/integration/common/00_pre_configurations.js
index 4f7a98d5ce..77e7af7e25 100644
--- a/scripts/cypress-v2/integration/common/00_pre_configurations.js
+++ b/scripts/cypress-v2/integration/common/00_pre_configurations.js
@@ -193,6 +193,7 @@ export const genTest = (apiType, dbType) => {
                         }
                     } else {
                         projectsPage.createProject(proj.basic, proj.config);
+                        cy.wait(5000);
                         if (dbType === "xcdb") {
                             // store base URL- to re-visit and delete form view later
                             let projId;
diff --git a/scripts/cypress-v2/support/page_objects/navigation.js b/scripts/cypress-v2/support/page_objects/navigation.js
index c0f4fb0e1a..6f906ecc1c 100644
--- a/scripts/cypress-v2/support/page_objects/navigation.js
+++ b/scripts/cypress-v2/support/page_objects/navigation.js
@@ -287,7 +287,7 @@ export class _projectsPage {
     // }
 
     waitHomePageLoad() {
-        // cy.url({ timeout: 50000 }).should("contain", "&dbalias=");
+        cy.url({ timeout: 50000 }).should("contain", "/#/nc/p_");
     }
 }
 

From eccb6d0acad375c45b343bad655e3b706d3eaf42 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 31 Aug 2022 23:20:15 +0530
Subject: [PATCH 3/3] test: fix handling of datatype with length info

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../src/lib/db/sql-mgr/code/models/xc/ModelXcMetaSqlite.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaSqlite.ts b/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaSqlite.ts
index 670a01db5a..99c5761b69 100644
--- a/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaSqlite.ts
+++ b/packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaSqlite.ts
@@ -559,7 +559,8 @@ class ModelXcMetaSqlite extends BaseModelXcMeta {
   }
 
   private getAbstractType(col): any {
-    switch ((col.dt || col.dt).toLowerCase()) {
+    // remove length value from datatype (for ex. varchar(45) => varchar)
+    switch (col.dt?.replace(/\(\d+\)$/, '').toLowerCase()) {
       case 'date':
         return 'date';
       case 'datetime':