MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing defaults in MS-SQL as well.

This commit is contained in:
mike12345567 2023-04-14 18:10:10 +01:00
parent 09ccac12ae
commit c552913737
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/server/scripts/integrations/mssql/data/entrypoint.sh
View File

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

34
packages/server/scripts/integrations/mssql/data/setup.sql
View File

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

3
packages/server/src/integrations/microsoftSqlServer.ts
View File

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