#9: Isolate mysql generated columns from integration tests so the bui…

…ld can execute, for now, without these features
laingsimon · Mar 2, 2021 · 01bcc01 · 01bcc01
1 parent d8e8124
commit 01bcc01
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 8 deletions.
diff --git a/TestScenarios/Read_AllColumnTypes/#9-Database.MySql.sql b/TestScenarios/Read_AllColumnTypes/#9-Database.MySql.sql
@@ -0,0 +1,10 @@
+CREATE TABLE `Person` (
+	Id 			int not null auto_increment primary key,
+	Name 		nvarchar(255) not null,
+	Title		varchar(10),
+	Age			int,
+	Price		decimal(18, 2),
+	DoB			date,
+	Deleted		bit(1) not null default 0,
+    PriceIncVat decimal(18, 2) AS (`Price` * 1.2)
+);
diff --git a/TestScenarios/Read_AllColumnTypes/#9-ExpectedOutput.MySql.json b/TestScenarios/Read_AllColumnTypes/#9-ExpectedOutput.MySql.json
@@ -0,0 +1,45 @@
+{
+  "tables": {
+    "`Person`": {
+      "columns": {
+        "Id": {
+          "type": "int",
+          "nullable": false,
+          "primaryKey": true
+        },
+        "Name": {
+          "type": "nvarchar(255)",
+          "nullable": false,
+          "primaryKey": false
+        },
+        "Title": {
+          "type": "varchar(10)",
+          "primaryKey": false
+        },
+        "Age": {
+          "type": "int",
+          "primaryKey": false
+        },
+        "Price": {
+          "type": "decimal(18,2)",
+          "primaryKey": false
+        },
+        "DoB": {
+          "type": "date",
+          "primaryKey": false
+        },
+        "Deleted": {
+          "type": "bit(1)",
+          "nullable": false,
+          "default": 0,
+          "primaryKey": false
+        },
+        "PriceIncVat": {
+          "expression": "`Price` * 1.2",
+          "primaryKey": false,
+          "type": "decimal(18,2)"
+        }
+      }
+    }
+  }
+}
diff --git a/TestScenarios/Read_AllColumnTypes/Database.MySql.sql b/TestScenarios/Read_AllColumnTypes/Database.MySql.sql
@@ -5,6 +5,5 @@ CREATE TABLE `Person` (
 	Age			int,
 	Price		decimal(18, 2),
 	DoB			date,
-	Deleted		bit(1) not null default 0,
-	PriceIncVat decimal(18, 2) AS (`Price` * 1.2)
+	Deleted		bit(1) not null default 0
 );
diff --git a/TestScenarios/Read_AllColumnTypes/ExpectedOutput.MySql.json b/TestScenarios/Read_AllColumnTypes/ExpectedOutput.MySql.json
@@ -33,11 +33,6 @@
           "nullable": false,
           "default": 0,
           "primaryKey": false
-        },
-        "PriceIncVat": {
-          "expression": "`Price` * 1.2",
-          "primaryKey": false,
-          "type": "decimal(18,2)"
         }
       }
     }

diff --git a/TestScenarios/Read_AllColumnTypes/README.md b/TestScenarios/Read_AllColumnTypes/README.md
@@ -1,3 +1,6 @@
 This scenario tests vcdb to confirm it can create the expected schema JSON from a given database.
 
-This scenario tests that all built in SQL data types can be read correctly.
+This scenario tests that all built in SQL data types can be read correctly.
+
+MySql generated columns are supported from mysql v8, however the build environment doesn't support mysql v8 & sqlserver at the same time, see issue #9.
+Until this issue is resolved, all tests need to be paired back to what mysql v5.7.3 supports.