Skip to content

Commit 512b2fc

Browse files
committed
Use shorthand notation when setting default values
1 parent 967163e commit 512b2fc

File tree

5 files changed

+17
-18
lines changed

5 files changed

+17
-18
lines changed

scripts/db.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ const mysql = require('mysql')
33
const argv = require('minimist')(process.argv.slice(2))
44
const sprintf = require('sprintf-js').sprintf
55

6-
const MYSQL_USERNAME = argv.user ? argv.user : 'root'
7-
const MYSQL_PASSWORD = argv.pass ? argv.pass : ''
8-
const MYSQL_DATABASE = argv.database ? argv.database : 'mysql_note'
9-
const MYSQL_HOSTNAME = argv.host ? argv.host : 'localhost'
6+
const MYSQL_USERNAME = argv.user || 'root'
7+
const MYSQL_PASSWORD = argv.pass || ''
8+
const MYSQL_DATABASE = argv.database || 'mysql_note'
9+
const MYSQL_HOSTNAME = argv.host || 'localhost'
1010
const MYSQL_PORT = argv.port ? parseInt(argv.port) : 3306
1111

1212
const con = mysql.createConnection({
@@ -17,9 +17,8 @@ const con = mysql.createConnection({
1717
port: MYSQL_PORT
1818
})
1919

20-
module.exports =
21-
{
20+
module.exports = {
2221
argv: argv,
2322
sprintf: sprintf,
2423
con: con
25-
}
24+
}

scripts/delete.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ const id = db.argv.id || parseInt(db.argv.id)
55

66
db.con.connect(function(err) {
77
if (err) {
8-
console.log('Failed to connect')
8+
console.error('Failed to connect')
99
throw err
1010
}
1111
let sql = 'DELETE FROM post' + (id ? ' WHERE id = ' + id : '')
1212
db.con.query(sql, (err, result) => {
1313
if (err) {
1414
throw err
1515
}
16-
console.log('Removed ' + result.affectedRows + ' record(s)')
16+
console.info('Removed ' + result.affectedRows + ' record(s)')
1717
process.exit(0)
1818
})
1919
})

scripts/insert.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
#!/usr/bin/env node
22
const db = require('./db')
33

4-
const title = db.argv.title ? db.argv.title : ''
5-
const content = db.argv.content ? db.argv.content : ''
6-
const image = db.argv.image ? db.argv.image : ''
4+
const title = db.argv.title || ''
5+
const content = db.argv.content || ''
6+
const image = db.argv.image || ''
77

88
db.con.connect(function(err) {
99
if (err) {
10-
console.log('Failed to connect')
10+
console.error('Failed to connect')
1111
throw err
1212
}
1313
let sql = db.sprintf("INSERT INTO post VALUES(NULL, '%s', '%s', '%s')", title, content, image)
1414
db.con.query(sql, (err, result) => {
1515
if (err) {
1616
throw err
1717
}
18-
console.log('Inserted ' + result.affectedRows + ' record(s)')
18+
console.info('Inserted ' + result.affectedRows + ' record(s)')
1919
process.exit(0)
2020
})
2121
})

scripts/select.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const id = db.argv.id || parseInt(db.argv.id)
55

66
db.con.connect(function(err) {
77
if (err) {
8-
console.log('Failed to connect')
8+
console.error('Failed to connect')
99
throw err
1010
}
1111
let sql = 'SELECT * FROM post'
@@ -17,7 +17,7 @@ db.con.connect(function(err) {
1717
throw err
1818
}
1919
for (let i = 0; i < result.length; i++) {
20-
console.log(result[i])
20+
console.info(result[i])
2121
}
2222
process.exit(0)
2323
})

scripts/update.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if (!title && !content && !image) {
1515

1616
db.con.connect(function(err) {
1717
if (err) {
18-
console.log('Failed to connect')
18+
console.error('Failed to connect')
1919
throw err
2020
}
2121
let sql = 'UPDATE post SET '
@@ -34,7 +34,7 @@ db.con.connect(function(err) {
3434
if (err) {
3535
throw err
3636
}
37-
console.log('Updated ' + result.affectedRows + ' record(s)')
37+
console.info('Updated ' + result.affectedRows + ' record(s)')
3838
process.exit(0)
3939
})
4040
})

0 commit comments

Comments
 (0)