Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unneeded complex object destruction default syntax #28 #29

Merged
merged 1 commit into from
Jul 12, 2019
Merged

Remove unneeded complex object destruction default syntax #28 #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = ({
client,
defaultSerialColumn: defaultSerialColumn = 'id',
defaultSerialColumn = 'id',
defaultSchema,
defaultFallbackLimit: defaultFallbackLimit = 10,
defaultMaxLimit: defaultMaxLimit = 100,
defaultPageSize: defaultPageSize = 10
defaultFallbackLimit = 10,
defaultMaxLimit = 100,
defaultPageSize = 10
} = {}) => {
const symbol = Symbol('sql-pg')

Expand Down Expand Up @@ -55,7 +55,7 @@ module.exports = ({

sql.insert = async (...params) => {
if (typeof params[0] === 'string' || Array.isArray(params[0])) {
let [table, rows, { columns, serialColumn: serialColumn = sql.defaultSerialColumn } = {}] = params
let [table, rows, { columns, serialColumn = sql.defaultSerialColumn } = {}] = params
let array = true
if (!Array.isArray(rows)) {
rows = [rows]
Expand All @@ -70,7 +70,7 @@ module.exports = ({
}
return result.rows.map(row => row[serialColumn])
}
const [query, { serialColumn: serialColumn = sql.defaultSerialColumn } = {}] = params
const [query, { serialColumn = sql.defaultSerialColumn } = {}] = params
const result = await sql.query(query)
return result.rows.map(row => row[serialColumn])
}
Expand Down Expand Up @@ -161,7 +161,7 @@ module.exports = ({

sql.column = column => sql.columns([column])

sql.values = (values, { columns: columns = Object.keys(values) } = {}) => {
sql.values = (values, { columns = Object.keys(values) } = {}) => {
if (!Array.isArray(values)) {
values = columns.map(column => values[column])
}
Expand All @@ -173,7 +173,7 @@ module.exports = ({

sql.value = value => sql.values([value])

sql.valuesList = (valuesList, { columns: columns = Object.keys(valuesList[0]) } = {}) =>
sql.valuesList = (valuesList, { columns = Object.keys(valuesList[0]) } = {}) =>
parameterPosition => {
const queries = []
for (const values of valuesList) {
Expand Down Expand Up @@ -229,7 +229,7 @@ module.exports = ({

sql.defaultMaxLimit = defaultMaxLimit

sql.limit = (limit, { fallbackLimit: fallbackLimit = sql.defaultFallbackLimit, maxLimit: maxLimit = sql.defaultMaxLimit } = {}) =>
sql.limit = (limit, { fallbackLimit = sql.defaultFallbackLimit, maxLimit = sql.defaultMaxLimit } = {}) =>
() => ({
text: 'LIMIT ' + Math.min(positiveNumber(limit, fallbackLimit), maxLimit),
parameters: []
Expand All @@ -243,7 +243,7 @@ module.exports = ({

sql.defaultPageSize = defaultPageSize

sql.pagination = (page, { pageSize: pageSize = sql.defaultPageSize } = {}) =>
sql.pagination = (page, { pageSize = sql.defaultPageSize } = {}) =>
() => ({
text: sql.limit(pageSize)().text + ' ' + sql.offset(page * pageSize)().text,
parameters: []
Expand Down