commit e5a9bd4c35135cd58a106355d1651c8dfc7b9da5 parent 90c821d0575383a650c96c37c48b6f346b66ef4f Author: priscilla <priscilla.huang@efrei.net> Date: Tue, 21 Feb 2023 07:24:30 -0500 database change on merchant004.sql Diffstat:
| M | src/backenddb/merchant-0004.sql | | | 12 | ------------ |
1 file changed, 0 insertions(+), 12 deletions(-)
diff --git a/src/backenddb/merchant-0004.sql b/src/backenddb/merchant-0004.sql @@ -111,17 +111,6 @@ COMMENT ON COLUMN merchant_kyc.aml_decision ALTER TABLE merchant_orders -<<<<<<< HEAD - ADD COLUMN pos_key VARCHAR; -COMMENT ON COLUMN merchant_orders.pos_key - IS 'point-of-sale key which is used for the verification of payment'; - - -ALTER TABLE merchant_contract_terms - ADD COLUMN pos_key VARCHAR; -COMMENT ON COLUMN merchant_contract_terms.pos_key - IS 'point-of-sale key which is used for the verification of payment'; -======= ADD COLUMN pos_key VARCHAR DEFAULT NULL; ADD COLUMN pricing_algorithm INT8; @@ -140,7 +129,6 @@ COMMENT ON COLUMN merchant_contract_terms.pos_key IS 'enconded based key which is used for the verification of payment'; COMMENT ON COLUMN merchant_orders.pricing_algorithm IS 'algorithm to put the price of the order. It is link with the pos_key'; ->>>>>>> 43030855 (added alter table for merchant order and merchant contract terms) COMMIT;