From 742913db369b4922cbf37aab0821e1bacad6523d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Tue, 5 Jan 2021 08:31:25 +0000 Subject: [PATCH] fix: normalize SQL --- lib/coupon-manager.js | 8 ++++---- migrations/1603886141913-coupon-codes.js | 12 ++++++------ migrations/1604419505567-add-discount-to-txs.js | 4 ++-- migrations/1606910357208-change-trades.js | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/coupon-manager.js b/lib/coupon-manager.js index efc065be..7963484e 100644 --- a/lib/coupon-manager.js +++ b/lib/coupon-manager.js @@ -2,22 +2,22 @@ const db = require('./db') const uuid = require('uuid') function getAvailableCoupons () { - const sql = `select * from coupons where soft_deleted=false` + const sql = `SELECT * FROM coupons WHERE soft_deleted=false` return db.any(sql) } function getCoupon (code) { - const sql = `select * from coupons where code=$1 and soft_deleted=false` + const sql = `SELECT * FROM coupons WHERE code=$1 AND soft_deleted=false` return db.oneOrNone(sql, [code]) } function createCoupon (code, discount) { - const sql = `insert into coupons (id, code, discount) values ($1, $2, $3) returning *` + const sql = `INSERT INTO coupons (id, code, discount) VALUES ($1, $2, $3) RETURNING *` return db.one(sql, [uuid.v4(), code, discount]) } function softDeleteCoupon (couponId) { - const sql = `update coupons set soft_deleted=true where id=$1` + const sql = `UPDATE coupons SET soft_deleted=true WHERE id=$1` return db.none(sql, [couponId]) } diff --git a/migrations/1603886141913-coupon-codes.js b/migrations/1603886141913-coupon-codes.js index eb3527c2..442fd335 100644 --- a/migrations/1603886141913-coupon-codes.js +++ b/migrations/1603886141913-coupon-codes.js @@ -3,12 +3,12 @@ var db = require('./db') exports.up = function (next) { const sql = [ - `create table coupons ( - id uuid primary key, - code text not null, - discount smallint not null, - soft_deleted boolean default false )`, - `create unique index uq_code on coupons using btree(code) where not soft_deleted` + `CREATE TABLE coupons ( + id UUID PRIMARY KEY, + code TEXT NOT NULL, + discount SMALLINT NOT NULL, + soft_deleted BOOLEAN DEFAULT false )`, + `CREATE UNIQUE INDEX uq_code ON coupons USING btree(code) WHERE NOT soft_deleted` ] db.multi(sql, next) diff --git a/migrations/1604419505567-add-discount-to-txs.js b/migrations/1604419505567-add-discount-to-txs.js index 00572698..e1870b16 100644 --- a/migrations/1604419505567-add-discount-to-txs.js +++ b/migrations/1604419505567-add-discount-to-txs.js @@ -2,8 +2,8 @@ const db = require('./db') exports.up = function (next) { var sql = [ - 'alter table cash_in_txs add column discount smallint', - 'alter table cash_out_txs add column discount smallint' + 'ALTER TABLE cash_in_txs ADD COLUMN discount SMALLINT', + 'ALTER TABLE cash_out_txs ADD COLUMN discount SMALLINT' ] db.multi(sql, next) diff --git a/migrations/1606910357208-change-trades.js b/migrations/1606910357208-change-trades.js index 756b24e1..a7a402c8 100644 --- a/migrations/1606910357208-change-trades.js +++ b/migrations/1606910357208-change-trades.js @@ -2,10 +2,10 @@ const db = require('./db') exports.up = function (next) { var sql = [ - 'alter table trades add column tx_in_id uuid unique', - 'alter table trades add constraint fk_tx_in foreign key (tx_in_id) references cash_in_txs (id)', - 'alter table trades add column tx_out_id uuid unique', - 'alter table trades add constraint fk_tx_out foreign key (tx_in_id) references cash_out_txs (id)' + 'ALTER TABLE trades ADD COLUMN tx_in_id UUID UNIQUE', + 'ALTER TABLE trades ADD CONSTRAINT fk_tx_in FOREIGN KEY (tx_in_id) REFERENCES cash_in_txs (id)', + 'ALTER TABLE trades ADD COLUMN tx_out_id UUID UNIQUE', + 'ALTER TABLE trades ADD CONSTRAINT fk_tx_out FOREIGN KEY (tx_in_id) REFERENCES cash_out_txs (id)' ] db.multi(sql, next)