Browse Source

Merge pull request #1076 from Budibase/0.7-bugfixes

0.7 bugfixes
gh-pages
Martin McKeaveney 6 years ago
committed by GitHub
parent
commit
118b31cd4d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte
  2. 5
      packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
  3. 5
      packages/server/src/integrations/microsoftSqlServer.js
  4. 14
      packages/server/src/integrations/mysql.js

6
packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte

@ -167,7 +167,13 @@
.binding__description { .binding__description {
color: var(--grey-8); color: var(--grey-8);
margin-top: 2px; margin-top: 2px;
white-space: normal;
} }
pre {
white-space: normal;
}
.binding__type { .binding__type {
font-family: monospace; font-family: monospace;
background-color: var(--grey-2); background-color: var(--grey-2);

5
packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte

@ -170,6 +170,11 @@
border-width: 1px 0 1px 0; border-width: 1px 0 1px 0;
} }
pre,
.description {
white-space: normal;
}
li:hover { li:hover {
color: var(--ink); color: var(--ink);
font-weight: 500; font-weight: 500;

5
packages/server/src/integrations/microsoftSqlServer.js

@ -17,6 +17,11 @@ const SCHEMA = {
type: FIELD_TYPES.STRING, type: FIELD_TYPES.STRING,
default: "localhost", default: "localhost",
}, },
port: {
type: FIELD_TYPES.NUMBER,
required: false,
default: 1433,
},
database: { database: {
type: FIELD_TYPES.STRING, type: FIELD_TYPES.STRING,
default: "root", default: "root",

14
packages/server/src/integrations/mysql.js

@ -1,25 +1,31 @@
const mysql = require("mysql") const mysql = require("mysql")
const { FIELD_TYPES } = require("./Integration")
const SCHEMA = { const SCHEMA = {
docs: "https://github.com/mysqljs/mysql", docs: "https://github.com/mysqljs/mysql",
datasource: { datasource: {
host: { host: {
type: "string", type: FIELD_TYPES.STRING,
default: "localhost", default: "localhost",
required: true, required: true,
}, },
port: {
type: FIELD_TYPES.NUMBER,
default: 1433,
required: false,
},
user: { user: {
type: "string", type: FIELD_TYPES.STRING,
default: "root", default: "root",
required: true, required: true,
}, },
password: { password: {
type: "password", type: FIELD_TYPES.PASSWORD,
default: "root", default: "root",
required: true, required: true,
}, },
database: { database: {
type: "string", type: FIELD_TYPES.STRING,
required: true, required: true,
}, },
}, },

Loading…
Cancel
Save