Skip to content

Commit 0284370

Browse files
Update sailor to 2.6.7 (#17)
1 parent 568dcad commit 0284370

File tree

12 files changed

+1972
-1632
lines changed

12 files changed

+1972
-1632
lines changed

.eslintrc.js

Lines changed: 3 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -1,159 +1,7 @@
1-
'use strict';
2-
3-
const ERROR = 'error';
4-
const WARN = 'warn';
5-
const ALWAYS = 'always';
6-
const NEVER = 'never';
7-
81
module.exports = {
2+
'extends': 'airbnb-base',
93
'env': {
10-
es6: true,
11-
node: true,
12-
mocha: true
13-
},
14-
plugins: [
15-
"json",
16-
"mocha"
17-
],
18-
'extends': 'eslint:recommended',
19-
'rules': {
20-
'indent': [
21-
ERROR,
22-
4,
23-
{
24-
SwitchCase: 1
25-
}
26-
],
27-
'linebreak-style': ERROR,
28-
'quotes': [
29-
WARN,
30-
'single'
31-
],
32-
'semi': [
33-
ERROR,
34-
ALWAYS
35-
],
36-
'func-names': ERROR,
37-
'no-empty': ERROR,
38-
'no-empty-function': ERROR,
39-
'brace-style': [
40-
ERROR,
41-
'1tbs',
42-
{allowSingleLine: true}
43-
],
44-
'no-multiple-empty-lines': ERROR,
45-
'no-multi-spaces': ERROR,
46-
'one-var': [
47-
ERROR,
48-
NEVER
49-
],
50-
'quote-props': [
51-
WARN,
52-
'consistent-as-needed'
53-
],
54-
'key-spacing': ERROR,
55-
'space-unary-ops': [
56-
ERROR,
57-
{
58-
words: true,
59-
nonwords: false
60-
}
61-
],
62-
'no-spaced-func': ERROR,
63-
'space-before-function-paren': [
64-
ERROR,
65-
{
66-
anonymous: ALWAYS,
67-
named: NEVER
68-
}
69-
],
70-
'arrow-body-style': [
71-
WARN,
72-
'as-needed'
73-
],
74-
'array-bracket-spacing': ERROR,
75-
'space-in-parens': ERROR,
76-
'comma-dangle': ERROR,
77-
'no-trailing-spaces': ERROR,
78-
'yoda': ERROR,
79-
'max-len': [
80-
ERROR,
81-
120
82-
],
83-
'camelcase': [
84-
ERROR,
85-
{
86-
properties: 'never'
87-
}
88-
],
89-
'new-cap': [
90-
WARN,
91-
{
92-
capIsNewExceptions: ['Q']
93-
}
94-
],
95-
'comma-style': ERROR,
96-
'curly': ERROR,
97-
'object-curly-spacing': [
98-
WARN,
99-
ALWAYS
100-
],
101-
'object-curly-newline': [
102-
ERROR,
103-
{
104-
ObjectExpression: {
105-
minProperties: 1
106-
},
107-
ObjectPattern: {
108-
minProperties: 5
109-
}
110-
}
111-
],
112-
'object-property-newline': ERROR,
113-
'template-curly-spacing': ERROR,
114-
'dot-notation': ERROR,
115-
'dot-location': [
116-
ERROR,
117-
'property'
118-
],
119-
'func-style': [
120-
ERROR,
121-
'declaration',
122-
{
123-
allowArrowFunctions: true
124-
}
125-
],
126-
'eol-last': ERROR,
127-
'space-infix-ops': ERROR,
128-
'keyword-spacing': ERROR,
129-
'space-before-blocks': ERROR,
130-
'no-invalid-this': ERROR,
131-
'consistent-this': ERROR,
132-
'no-this-before-super': ERROR,
133-
'no-unreachable': ERROR,
134-
'no-sparse-arrays': ERROR,
135-
'array-callback-return': ERROR,
136-
'strict': [
137-
WARN,
138-
'global'
139-
],
140-
'eqeqeq': ERROR,
141-
'no-use-before-define': WARN,
142-
'no-undef': ERROR,
143-
'no-unused-vars': WARN,
144-
'no-mixed-spaces-and-tabs': ERROR,
145-
'operator-linebreak': [
146-
ERROR,
147-
'before'
148-
],
149-
'no-console': [
150-
WARN,
151-
{
152-
'allow': [
153-
'warn',
154-
'error'
155-
]
156-
}
157-
]
4+
'mocha': true,
5+
'node': true,
1586
}
1597
};

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
node_modules
22
coverage
33
.idea
4+
.env

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- v8
4-
- v7
5-
- v6
3+
- v14
4+
- v13
5+
- v12
66
script: npm test && npm run integration-test

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.1.1 (May 11, 2020)
2+
3+
* Update sailor version to 2.6.7
4+
15
## 1.1.0 (January 30, 2020)
26

37
* Update sailor version to 2.6.1

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ where just before executing the statement the ``%%EIO_LAST_POLL%%`` will be repl
4848

4949
You may use this action to do the operations that are not producing output rows but do the database manipulations,
5050
e.g. ``INSERT``, ``UPDATE`` or ``DELETE`` statements. Internally we use prepared statements, so all incoming data is
51-
validated against SQL injetion, however we had to build a connection from JavaSscript types to the MSSQL data types
51+
validated against SQL injetion, however we had to build a connection from JavaScript types to the MSSQL data types
5252
therefore when doing a prepared statements you would need to add ``:type`` to **each prepared statement variable**.
5353

5454
For example if you have a following SQL statement:

component.json

Lines changed: 68 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,75 +5,105 @@
55
"credentials": {
66
"fields": {
77
"server": {
8-
"label": "Server (you can use 'host\\\\instance' to connect to named instance)",
8+
"label": "Server",
99
"required": true,
1010
"viewClass": "TextFieldView",
11-
"placeholder": "localhost"
12-
},
13-
"port": {
14-
"label": "Port (don't set when connecting to named instance)",
15-
"required": false,
16-
"viewClass": "TextFieldView",
17-
"placeholder": "1433"
11+
"placeholder": "localhost",
12+
"help": {
13+
"description": "Server to connect. You can use 'host\\\\instance' to connect to named instance."
14+
}
1815
},
19-
"database": {
16+
"database": {
2017
"label": "Database Name",
2118
"required": true,
2219
"viewClass": "TextFieldView",
23-
"placeholder": "database"
24-
},
25-
"encrypt": {
26-
"label": "Encrypt (check this option if you're using Windows Azure)",
27-
"viewClass": "CheckBoxView"
28-
},
29-
"domain": {
30-
"label": "Domain (driver will connect to SQL Server using domain login)",
31-
"required": false,
32-
"viewClass": "TextFieldView",
33-
"placeholder": "domain"
20+
"placeholder": "database",
21+
"help": {
22+
"description": "Database to connect. Default is dependent on server configuration."
23+
}
3424
},
35-
"username": {
25+
"username": {
3626
"label": "Username",
3727
"required": true,
3828
"viewClass": "TextFieldView",
39-
"placeholder": "username"
29+
"placeholder": "username",
30+
"help": {
31+
"description": "User name to use for authentication with the database."
32+
}
4033
},
4134
"password": {
4235
"label": "Password",
4336
"required": true,
4437
"viewClass": "PasswordFieldView",
45-
"placeholder": "password"
38+
"placeholder": "password",
39+
"help": {
40+
"description": "Password to use for authentication with the database."
41+
}
42+
},
43+
"port": {
44+
"label": "Port",
45+
"required": false,
46+
"viewClass": "TextFieldView",
47+
"placeholder": "1433",
48+
"help": {
49+
"description": "Port to connect. If not provided default port 1433 is used. Don't set when connecting to named instance."
50+
}
51+
},
52+
"domain": {
53+
"label": "Domain",
54+
"required": false,
55+
"viewClass": "TextFieldView",
56+
"placeholder": "domain",
57+
"help": {
58+
"description": "If domain is provided, the connection to SQL Server will be done using domain login."
59+
}
60+
},
61+
"encrypt": {
62+
"label": "Encrypt",
63+
"viewClass": "CheckBoxView",
64+
"help": {
65+
"description": "Enable this option if you're using Windows Azure"
66+
}
4667
}
4768
}
4869
},
4970
"actions": {
5071
"insert": {
5172
"title": "INSERT/UPDATE/DELETE",
52-
"description": "Executes a single SQL statement that causes database data update and returns a number of affected records, like INSERT, UPDATE or DELETE",
5373
"main": "./lib/actions/insert.js",
74+
"help": {
75+
"description": "Executes a single SQL statement that causes database data update and returns a number of affected records, like INSERT, UPDATE or DELETE",
76+
"link": "/components/mssql/index.html#insertdeleteupdate-action"
77+
},
5478
"fields": {
5579
"query": {
5680
"label": "SQL Query",
5781
"required": true,
5882
"viewClass": "TextAreaWithNoteView",
5983
"placeholder": "INSERT INTO films (code,title,kind) VALUES (@code:number,@title:string,@kind:string)",
60-
"note": "You can use parameters of message body as <i>@value:number</i> and type is <i>:type</i>"
84+
"help": {
85+
"description": "SQL query to execute. You can use parameters of message body as '@value:number' and type is ':type'"
86+
}
6187
}
6288
},
6389
"dynamicMetadata": true
6490
},
6591
"selectAction": {
6692
"title": "SELECT",
67-
"description": "Executes a SELECT statement that fetches potentially multiple database rows from the database",
6893
"main": "./lib/actions/select.js",
94+
"help": {
95+
"description": "Executes a SELECT statement that fetches potentially multiple database rows from the database",
96+
"link": "/components/mssql/index.html#select-action"
97+
},
6998
"metadata": {
7099
"in": {
71100
"type": "object",
72101
"properties": {
73102
"query": {
74103
"type": "string",
75-
"title": "SQL Query",
76-
"required": true
104+
"title": "SQL SELECT Statement",
105+
"required": true,
106+
"description": "Executes a SELECT statement that fetches potentially multiple database rows from the database"
77107
}
78108
}
79109
}
@@ -82,17 +112,22 @@
82112
},
83113
"triggers": {
84114
"selectTrigger": {
85-
"title": "SELECT",
86-
"description": "Executes a SELECT statement that fetches potentially multiple database rows from the database",
115+
"title": "SQL SELECT Statement",
87116
"main": "./lib/actions/select.js",
88117
"type": "polling",
118+
"help": {
119+
"description": "Executes a SELECT statement that fetches potentially multiple database rows from the database",
120+
"link": "/components/mssql/index.html#select-trigger-and-action"
121+
},
89122
"fields": {
90123
"query": {
91-
"label": "SQL Query",
124+
"label": "SQL SELECT Statement",
92125
"required": true,
93126
"viewClass": "TextAreaWithNoteView",
94-
"placeholder": "INSERT INTO films (code,title,kind) VALUES (@code:number,@title:string,@kind:string)",
95-
"note": "You can use parameters of message body as <i>@value:number</i> and type is <i>:type</i>"
127+
"placeholder": "SELECT * FROM Employee WHERE EmpID = 322",
128+
"help": {
129+
"description": "SQL SELECT Statement to execute"
130+
}
96131
}
97132
},
98133
"metadata": {

0 commit comments

Comments
 (0)