From c4801a3d1268f6c7cbefab7fa82b8aa3d9a5cab8 Mon Sep 17 00:00:00 2001 From: Immanuel Onyeka Date: Sat, 12 Nov 2022 15:22:58 -0500 Subject: [PATCH] Fix SQL syntax errors --- migrations/0_29092022_create_main_tables.sql | 3 +- migrations/reset.sql | 3 +- migrations/seed.sql | 32 ++++++++------------ 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/migrations/0_29092022_create_main_tables.sql b/migrations/0_29092022_create_main_tables.sql index 87d68de..369f044 100644 --- a/migrations/0_29092022_create_main_tables.sql +++ b/migrations/0_29092022_create_main_tables.sql @@ -19,7 +19,7 @@ CREATE TABLE user ( last_name VARCHAR(30) NOT NULL, password CHAR(64) NOT NULL, verified BOOLEAN, - branch_id INT, + branch_id INT NULL, /* The password should be a SHA256 hash in hex format. It's length doesn't * vary */ country ENUM('Canada', 'USA'), @@ -33,7 +33,6 @@ CREATE TABLE user ( 'Branch Subscribed'), PRIMARY KEY (`id`), FOREIGN KEY (branch_id) REFERENCES branch(id) - ON DELETE SET NULL ); CREATE TABLE license ( diff --git a/migrations/reset.sql b/migrations/reset.sql index 98cb39b..dab41c0 100644 --- a/migrations/reset.sql +++ b/migrations/reset.sql @@ -1,8 +1,9 @@ +DROP TABLE IF EXISTS comparison; DROP TABLE IF EXISTS fee; +DROP TABLE IF EXISTS fee_template; DROP TABLE IF EXISTS estimate; DROP TABLE IF EXISTS borrower; DROP TABLE IF EXISTS loan_type; DROP TABLE IF EXISTS license; DROP TABLE IF EXISTS user; DROP TABLE IF EXISTS branch; -DROP TABLE IF EXISTS comparison; diff --git a/migrations/seed.sql b/migrations/seed.sql index 2d97ba9..146306f 100644 --- a/migrations/seed.sql +++ b/migrations/seed.sql @@ -4,11 +4,10 @@ VALUES ('NMLS', 'abc123idk'), ('FSRA', 'another branch'); -INSERT INTO user - (firstName, - lastName, +INSERT INTO user ( + first_name, + last_name, password, - nmls, branch_id, country, title, @@ -21,8 +20,7 @@ INSERT INTO user 'Blue', 'Coltrane', sha2('test123', 256), - 'nml415bas', - 0, + (SELECT id FROM branch LIMIT 1), 'Canada', 'Loan Officer', 'test@example.com', @@ -34,8 +32,7 @@ INSERT INTO user 'Giant', 'Coltrane', sha2('test123', 256), - 'jsasd', - 0, + null, 'USA', 'Mortgage Broker', 'unverified@example.com', @@ -47,31 +44,26 @@ INSERT INTO user 'Jeru', 'Mulligan', sha2('test123', 256), - 'asb512', - 0, + (SELECT id FROM branch LIMIT 1), 'USA', 'Branch Manager', 'manager@example.com', true, 'Free' -), -; +); INSERT INTO license ( user_id, type, num ) VALUES - ( - (SELECT id FROM user WHERE email='verified@example.com'), + (SELECT id FROM user WHERE email = 'test@example.com' LIMIT 1), 'NMLS', - 'randomnmls', + 'randomnml523s' ), - ( - (SELECT id FROM user WHERE email='manager@example.com'), + (SELECT id FROM user WHERE email = 'manager@example.com' LIMIT 1), 'FSRA', - 'examplefsra', -) -; + '5234gsdf' +);