diff --git a/JavaScript/b-transport/db.js b/JavaScript/b-transport/db.js index 5e26018..32d7bc7 100644 --- a/JavaScript/b-transport/db.js +++ b/JavaScript/b-transport/db.js @@ -11,8 +11,8 @@ const crud = (pool) => (table) => ({ async read(id, fields = ['*']) { const names = fields.join(', '); const sql = `SELECT ${names} FROM ${table}`; - if (!id) return pool.query(sql); - return pool.query(`${sql} WHERE id = $1`, [id]); + if (!id) return this.query(sql); + return this.query(`${sql} WHERE id = $1`, [id]); }, async create({ ...record }) { @@ -27,7 +27,7 @@ const crud = (pool) => (table) => ({ const fields = '"' + keys.join('", "') + '"'; const params = nums.join(', '); const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`; - return pool.query(sql, data); + return this.query(sql, data); }, async update(id, { ...record }) { @@ -42,12 +42,12 @@ const crud = (pool) => (table) => ({ const delta = updates.join(', '); const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`; data.push(id); - return pool.query(sql, data); + return this.query(sql, data); }, async delete(id) { const sql = 'DELETE FROM ${table} WHERE id = $1'; - return pool.query(sql, [id]); + return this.query(sql, [id]); }, }); diff --git a/JavaScript/b-transport/transport/http.js b/JavaScript/b-transport/transport/http.js index fda7506..80851f1 100644 --- a/JavaScript/b-transport/transport/http.js +++ b/JavaScript/b-transport/transport/http.js @@ -32,7 +32,7 @@ module.exports = (routing, port, console) => { if (!handler) return res.end('"Not found"'); const { args } = await receiveArgs(req); console.log(`${socket.remoteAddress} ${method} ${url}`); - const result = await handler(args); + const result = await handler(...args); res.end(JSON.stringify(result)); }).listen(port); diff --git a/JavaScript/c-commonjs/db.js b/JavaScript/c-commonjs/db.js index 45a4a52..59e865f 100644 --- a/JavaScript/c-commonjs/db.js +++ b/JavaScript/c-commonjs/db.js @@ -17,8 +17,8 @@ const crud = (table) => ({ async read(id, fields = ['*']) { const names = fields.join(', '); const sql = `SELECT ${names} FROM ${table}`; - if (!id) return pool.query(sql); - return pool.query(`${sql} WHERE id = $1`, [id]); + if (!id) return this.query(sql); + return this.query(`${sql} WHERE id = $1`, [id]); }, async create({ ...record }) { @@ -33,7 +33,7 @@ const crud = (table) => ({ const fields = '"' + keys.join('", "') + '"'; const params = nums.join(', '); const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`; - return pool.query(sql, data); + return this.query(sql, data); }, async update(id, { ...record }) { @@ -48,12 +48,12 @@ const crud = (table) => ({ const delta = updates.join(', '); const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`; data.push(id); - return pool.query(sql, data); + return this.query(sql, data); }, async delete(id) { const sql = 'DELETE FROM ${table} WHERE id = $1'; - return pool.query(sql, [id]); + return this.query(sql, [id]); }, }); diff --git a/JavaScript/c-commonjs/transport/http.js b/JavaScript/c-commonjs/transport/http.js index fda7506..80851f1 100644 --- a/JavaScript/c-commonjs/transport/http.js +++ b/JavaScript/c-commonjs/transport/http.js @@ -32,7 +32,7 @@ module.exports = (routing, port, console) => { if (!handler) return res.end('"Not found"'); const { args } = await receiveArgs(req); console.log(`${socket.remoteAddress} ${method} ${url}`); - const result = await handler(args); + const result = await handler(...args); res.end(JSON.stringify(result)); }).listen(port); diff --git a/JavaScript/d-messenger/lib/db.js b/JavaScript/d-messenger/lib/db.js index 5e26018..32d7bc7 100644 --- a/JavaScript/d-messenger/lib/db.js +++ b/JavaScript/d-messenger/lib/db.js @@ -11,8 +11,8 @@ const crud = (pool) => (table) => ({ async read(id, fields = ['*']) { const names = fields.join(', '); const sql = `SELECT ${names} FROM ${table}`; - if (!id) return pool.query(sql); - return pool.query(`${sql} WHERE id = $1`, [id]); + if (!id) return this.query(sql); + return this.query(`${sql} WHERE id = $1`, [id]); }, async create({ ...record }) { @@ -27,7 +27,7 @@ const crud = (pool) => (table) => ({ const fields = '"' + keys.join('", "') + '"'; const params = nums.join(', '); const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`; - return pool.query(sql, data); + return this.query(sql, data); }, async update(id, { ...record }) { @@ -42,12 +42,12 @@ const crud = (pool) => (table) => ({ const delta = updates.join(', '); const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`; data.push(id); - return pool.query(sql, data); + return this.query(sql, data); }, async delete(id) { const sql = 'DELETE FROM ${table} WHERE id = $1'; - return pool.query(sql, [id]); + return this.query(sql, [id]); }, });