Skip to content

Commit e4a7ba4

Browse files
committed
Added timeout argument.
1 parent 7ebf8c2 commit e4a7ba4

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ npm install -g sqlcmdjs
1010
## Usage
1111

1212
```
13-
sqlcmd -s <server> -u <username> -p <password> [-d <database>] <script>
13+
sqlcmd -s <server> -u <username> -p <password> [-d <database>] [-t <timeout>] <script>
1414
```
1515

1616
If no script is specified, sqlcmd reads from the standard input.
@@ -30,6 +30,8 @@ cat script.sql | sqlcmd -s 127.0.0.1 -u sa -p p@ssw0rd
3030
```
3131

3232
## Version History
33+
+ **1.2**
34+
+ Added timeout argument.
3335
+ **1.1**
3436
+ Added support for scripts with GO statements.
3537
+ **1.0**

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sqlcmdjs",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"description": "sqlcmd for Mac and Linux.",
55
"main": "sqlcmd.js",
66
"dependencies": {

sqlcmd.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ var argv = require('optimist')
1010
.alias('u', 'user')
1111
.alias('p', 'password')
1212
.alias('d', 'database')
13+
.alias('t', 'timeout')
1314
.usage('Usage:' + eol +
14-
' sqlcmd -s <server> -u <username> -p <password> [-d <database>] <script>')
15+
' sqlcmd -s <server> -u <username> -p <password> [-d <database>] [-t <timeout>] <script>')
1516
.argv;
1617

1718
if (argv._.length === 0 || argv._[0] === '-') {
@@ -22,20 +23,20 @@ if (argv._.length === 0 || argv._[0] === '-') {
2223
});
2324

2425
process.stdin.on('end', function() {
25-
run(argv.server, argv.user, argv.password, argv.database, script);
26+
run(argv.server, argv.user, argv.password, argv.database, argv.timeout, script);
2627
});
2728
}
2829
else {
29-
run(argv.server, argv.user, argv.password, argv.database, argv._);
30+
run(argv.server, argv.user, argv.password, argv.database, argv.timeout, argv._);
3031
}
3132

32-
function run(server, user, password, database, script) {
33+
function run(server, user, password, database, timeout, script) {
3334
var config = {
3435
server: server,
3536
user: user,
3637
password: password,
3738
database: database || 'master',
38-
requestTimeout: 1000 * 60
39+
requestTimeout: (timeout || 60) * 1000
3940
}
4041

4142
var connection = new sql.Connection(config, function(error) {

0 commit comments

Comments
 (0)