@budibase/server 2.5.5-alpha.0 → 2.5.5-alpha.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.5.5-alpha.0",
+  "version": "2.5.5-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.5.5-alpha.0",
-    "@budibase/client": "2.5.5-alpha.0",
-    "@budibase/pro": "2.5.4",
-    "@budibase/shared-core": "2.5.5-alpha.0",
-    "@budibase/string-templates": "2.5.5-alpha.0",
-    "@budibase/types": "2.5.5-alpha.0",
+    "@budibase/backend-core": "2.5.5-alpha.2",
+    "@budibase/client": "2.5.5-alpha.2",
+    "@budibase/pro": "2.5.5-alpha.1",
+    "@budibase/shared-core": "2.5.5-alpha.2",
+    "@budibase/string-templates": "2.5.5-alpha.2",
+    "@budibase/types": "2.5.5-alpha.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -176,5 +176,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "84e8cc00315e223433e388b72fae3bd048ff5760"
+  "gitHead": "696bf03033e57dae59175aae552fc2fd45cfd0cf"
 }

package/scripts/integrations/mssql/data/entrypoint.sh

@@ -11,6 +11,7 @@ if [ "$1" = '/opt/mssql/bin/sqlservr' ]; then
 
       echo "RUNNING BUDIBASE SETUP"
 
+      cat setup.sql
       #run the setup script to create the DB and the schema in the DB
       /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Passw0rd -i setup.sql
 

package/scripts/integrations/mssql/data/setup.sql

@@ -34,7 +34,7 @@ GO
 CREATE TABLE people
 (
   name varchar(30) NOT NULL,
-  age varchar(20),
+  age int default 20 NOT NULL,
   CONSTRAINT pk_people PRIMARY KEY NONCLUSTERED (name, age)
 );
   
@@ -50,22 +50,22 @@ VALUES
   ('Processing', 1);
 
 INSERT INTO people (name, age)
-VALUES ('Bob', '30'),
-  ('Bert', '10'),
-  ('Jack', '12'),
-  ('Mike', '31'),
-  ('Dave', '44'),
-  ('Jim', '43'),
-  ('Kerry', '32'),
-  ('Julie', '12'),
-  ('Kim', '55'),
-  ('Andy', '33'),
-  ('John', '22'),
-  ('Ruth', '66'),
-  ('Robert', '88'),
-  ('Bobert', '99'),
-  ('Jan', '22'),
-  ('Megan', '11');
+VALUES ('Bob', 30),
+  ('Bert', 10),
+  ('Jack', 12),
+  ('Mike', 31),
+  ('Dave', 44),
+  ('Jim', 43),
+  ('Kerry', 32),
+  ('Julie', 12),
+  ('Kim', 55),
+  ('Andy', 33),
+  ('John', 22),
+  ('Ruth', 66),
+  ('Robert', 88),
+  ('Bobert', 99),
+  ('Jan', 22),
+  ('Megan', 11);
 
 
 IF OBJECT_ID ('Chains.sizes', 'U') IS NOT NULL

package/scripts/integrations/mysql/init.sql

@@ -3,7 +3,7 @@ USE main;
 CREATE TABLE Persons (
     PersonID int NOT NULL AUTO_INCREMENT,
     CreatedAt datetime,
-    Age float,
+    Age float DEFAULT 20 NOT NULL,
     LastName varchar(255),
     FirstName varchar(255),
     Address varchar(255),

package/scripts/integrations/postgres/init.sql

@@ -8,6 +8,7 @@ CREATE TABLE Persons (
     FirstName varchar(255),
     Address varchar(255),
     City varchar(255) DEFAULT 'Belfast',
+    Age INTEGER DEFAULT 20 NOT NULL,
     Type person_job
 );
 CREATE TABLE Tasks (

package/src/integrations/microsoftSqlServer.ts

@@ -243,11 +243,14 @@ class SqlServerIntegration extends Sql implements DatasourcePlus {
         if (typeof name !== "string") {
           continue
         }
+        const hasDefault = def.COLUMN_DEFAULT
+        const isAuto = !!autoColumns.find(col => col === name)
+        const required = !!requiredColumns.find(col => col === name)
         schema[name] = {
-          autocolumn: !!autoColumns.find(col => col === name),
+          autocolumn: isAuto,
           name: name,
           constraints: {
-            presence: requiredColumns.find(col => col === name),
+            presence: required && !isAuto && !hasDefault,
           },
           ...convertSqlType(def.DATA_TYPE),
           externalType: def.DATA_TYPE,

package/src/integrations/mysql.ts

@@ -229,13 +229,15 @@ class MySQLIntegration extends Sql implements DatasourcePlus {
           if (column.Key === "PRI" && primaryKeys.indexOf(column.Key) === -1) {
             primaryKeys.push(columnName)
           }
-          const constraints = {
-            presence: column.Null !== "YES",
-          }
+          const hasDefault = column.Default != null
           const isAuto: boolean =
             typeof column.Extra === "string" &&
             (column.Extra === "auto_increment" ||
               column.Extra.toLowerCase().includes("generated"))
+          const required = column.Null !== "YES"
+          const constraints = {
+            presence: required && !isAuto && !hasDefault,
+          }
           schema[columnName] = {
             name: columnName,
             autocolumn: isAuto,

package/src/integrations/postgres.ts

@@ -262,15 +262,17 @@ class PostgresIntegration extends Sql implements DatasourcePlus {
           column.identity_start ||
           column.identity_increment
         )
-        const constraints = {
-          presence: column.is_nullable === "NO",
-        }
-        const hasDefault =
+        const hasDefault = column.column_default != null
+        const hasNextVal =
           typeof column.column_default === "string" &&
           column.column_default.startsWith("nextval")
         const isGenerated =
           column.is_generated && column.is_generated !== "NEVER"
-        const isAuto: boolean = hasDefault || identity || isGenerated
+        const isAuto: boolean = hasNextVal || identity || isGenerated
+        const required = column.is_nullable === "NO"
+        const constraints = {
+          presence: required && !hasDefault && !isGenerated,
+        }
         tables[tableName].schema[columnName] = {
           autocolumn: isAuto,
           name: columnName,