From c235eda1b05a2820312aa6684e95c8c9036353e9 Mon Sep 17 00:00:00 2001 From: Nicolas Duhamel Date: Wed, 24 Feb 2016 13:34:55 +0100 Subject: [PATCH] Rename updated and created --- sql/0001_initial.up.sql | 16 ++++++++-------- sqly/sqly.go | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sql/0001_initial.up.sql b/sql/0001_initial.up.sql index 1dc0d31..74eb4f4 100644 --- a/sql/0001_initial.up.sql +++ b/sql/0001_initial.up.sql @@ -4,13 +4,13 @@ CREATE EXTENSION IF NOT EXISTS pgcrypto; CREATE OR REPLACE FUNCTION update_modified_column() RETURNS TRIGGER AS $$ BEGIN - NEW.updated = now(); + NEW.updated_at = now(); RETURN NEW; END; $$ language 'plpgsql'; CREATE TABLE base ( - updated timestamp DEFAULT current_timestamp, - created timestamp DEFAULT current_timestamp + updated_at timestamp DEFAULT current_timestamp, + created_at timestamp DEFAULT current_timestamp ); CREATE TABLE users ( @@ -19,7 +19,7 @@ CREATE TABLE users ( hash text NOT NULL, LIKE base INCLUDING DEFAULTS ); -CREATE TRIGGER update_users BEFORE UPDATE ON users FOR EACH ROW EXECUTE PROCEDURE update_modified_column(); +CREATE TRIGGER update_users_updated_at BEFORE UPDATE ON users FOR EACH ROW EXECUTE PROCEDURE update_modified_column(); CREATE TABLE tokens ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), @@ -27,7 +27,7 @@ CREATE TABLE tokens ( users_id uuid REFERENCES users (id) ON DELETE CASCADE, LIKE base INCLUDING DEFAULTS ); -CREATE TRIGGER update_tokens BEFORE UPDATE ON tokens FOR EACH ROW EXECUTE PROCEDURE update_modified_column(); +CREATE TRIGGER update_tokens_updated_at BEFORE UPDATE ON tokens FOR EACH ROW EXECUTE PROCEDURE update_modified_column(); CREATE TABLE shows ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), @@ -41,7 +41,7 @@ CREATE TABLE shows ( LIKE base INCLUDING DEFAULTS ); CREATE INDEX ON shows (imdbid); -CREATE TRIGGER update_shows BEFORE UPDATE ON shows FOR EACH ROW EXECUTE PROCEDURE update_modified_column(); +CREATE TRIGGER update_shows_updated_at BEFORE UPDATE ON shows FOR EACH ROW EXECUTE PROCEDURE update_modified_column(); CREATE TABLE episodes ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), @@ -59,7 +59,7 @@ CREATE TABLE episodes ( ); CREATE INDEX ON episodes (shows_id, season); CREATE INDEX ON episodes (shows_id, season, episode); -CREATE TRIGGER update_episodes BEFORE UPDATE ON episodes FOR EACH ROW EXECUTE PROCEDURE update_modified_column(); +CREATE TRIGGER update_episodes_updated_at BEFORE UPDATE ON episodes FOR EACH ROW EXECUTE PROCEDURE update_modified_column(); CREATE TABLE shows_tracked ( shows_id uuid NOT NULL REFERENCES shows (id) ON DELETE CASCADE, @@ -86,4 +86,4 @@ CREATE TABLE movies ( LIKE base INCLUDING DEFAULTS ); CREATE INDEX ON movies (imdbid); -CREATE TRIGGER update_movies BEFORE UPDATE ON movies FOR EACH ROW EXECUTE PROCEDURE update_modified_column(); +CREATE TRIGGER update_movies_updated_at BEFORE UPDATE ON movies FOR EACH ROW EXECUTE PROCEDURE update_modified_column(); diff --git a/sqly/sqly.go b/sqly/sqly.go index 3d1c5eb..1584847 100644 --- a/sqly/sqly.go +++ b/sqly/sqly.go @@ -12,8 +12,8 @@ import ( // BaseModel have to be embeded in all your struct which reflect a table type BaseModel struct { ID string - Updated time.Time - Created time.Time + Updated time.Time `db:"updated_at"` + Created time.Time `db:"created_at"` } // RunWithLastestMigration runs your test with database migration set to the lastest