From 7e74d672ba8f441424a414314b7a1612ba9dbc3b Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Thu, 16 Oct 2014 09:20:25 -0800
Subject: [PATCH] Using struct attrs to match desired db schema

---
 datastore/migrations/00001_AddUsers_up.sql   |  6 +++---
 datastore/migrations/00002_AddGenera_up.sql  | 10 +++++-----
 datastore/migrations/00003_AddSpecies_up.sql | 12 ++++++------
 models/genera.go                             |  8 ++++----
 models/species.go                            | 10 +++++-----
 models/users.go                              |  8 ++++----
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/datastore/migrations/00001_AddUsers_up.sql b/datastore/migrations/00001_AddUsers_up.sql
index 9dd8907..4ef446a 100644
--- a/datastore/migrations/00001_AddUsers_up.sql
+++ b/datastore/migrations/00001_AddUsers_up.sql
@@ -5,9 +5,9 @@ CREATE TABLE users (
     id BIGSERIAL NOT NULL,
     username CHARACTER VARYING(100),
 
-    createdat TIMESTAMP WITH TIME ZONE,
-    updatedat TIMESTAMP WITH TIME ZONE,
-    deletedat TIMESTAMP WITH TIME ZONE,
+    created_at TIMESTAMP WITH TIME ZONE,
+    updated_at TIMESTAMP WITH TIME ZONE,
+    deleted_at TIMESTAMP WITH TIME ZONE,
 
     CONSTRAINT users_pkey PRIMARY KEY (id)
 );
diff --git a/datastore/migrations/00002_AddGenera_up.sql b/datastore/migrations/00002_AddGenera_up.sql
index 3fa4d79..e9ea156 100644
--- a/datastore/migrations/00002_AddGenera_up.sql
+++ b/datastore/migrations/00002_AddGenera_up.sql
@@ -3,11 +3,11 @@
 
 CREATE TABLE genera (
     id BIGSERIAL NOT NULL,
-    genusname CHARACTER VARYING(100),
+    genus_name CHARACTER VARYING(100),
 
-    createdat TIMESTAMP WITH TIME ZONE,
-    updatedat TIMESTAMP WITH TIME ZONE,
-    deletedat TIMESTAMP WITH TIME ZONE,
+    created_at TIMESTAMP WITH TIME ZONE,
+    updated_at TIMESTAMP WITH TIME ZONE,
+    deleted_at TIMESTAMP WITH TIME ZONE,
 
     CONSTRAINT genus_pkey PRIMARY KEY (id)
 );
@@ -15,5 +15,5 @@ CREATE TABLE genera (
 CREATE UNIQUE INDEX genusname_idx
     ON genera
     USING btree
-    (genusname COLLATE pg_catalog."default");
+    (genus_name COLLATE pg_catalog."default");
 
diff --git a/datastore/migrations/00003_AddSpecies_up.sql b/datastore/migrations/00003_AddSpecies_up.sql
index aff073b..88a192a 100644
--- a/datastore/migrations/00003_AddSpecies_up.sql
+++ b/datastore/migrations/00003_AddSpecies_up.sql
@@ -3,13 +3,13 @@
 
 CREATE TABLE species (
     id BIGSERIAL NOT NULL,
-    genusid BIGINT NOT NULL,
-    speciesname CHARACTER VARYING(100),
+    genus_id BIGINT NOT NULL,
+    species_name CHARACTER VARYING(100),
 
-    createdat TIMESTAMP WITH TIME ZONE,
-    updatedat TIMESTAMP WITH TIME ZONE,
-    deletedat TIMESTAMP WITH TIME ZONE,
+    created_at TIMESTAMP WITH TIME ZONE,
+    updated_at TIMESTAMP WITH TIME ZONE,
+    deleted_at TIMESTAMP WITH TIME ZONE,
 
     CONSTRAINT species_pkey PRIMARY KEY (id),
-    FOREIGN KEY (genusid) REFERENCES genera(id)
+    FOREIGN KEY (genus_id) REFERENCES genera(id)
 );
diff --git a/models/genera.go b/models/genera.go
index fb87694..60cc2b0 100644
--- a/models/genera.go
+++ b/models/genera.go
@@ -12,10 +12,10 @@ import (
 // A Genus is a high-level classifier in bactdb.
 type Genus struct {
 	Id        int64     `json:"id,omitempty"`
-	GenusName string    `json:"genus_name"`
-	CreatedAt time.Time `json:"created_at"`
-	UpdatedAt time.Time `json:"updated_at"`
-	DeletedAt time.Time `json:"deleted_at"`
+	GenusName string    `db:"genus_name" json:"genus_name"`
+	CreatedAt time.Time `db:"created_at" json:"created_at"`
+	UpdatedAt time.Time `db:"updated_at" json:"updated_at"`
+	DeletedAt time.Time `db:"deleted_at" json:"deleted_at"`
 }
 
 // GeneraService interacts with the genus-related endpoints in bactdb's API.
diff --git a/models/species.go b/models/species.go
index 3437d8e..dbd696d 100644
--- a/models/species.go
+++ b/models/species.go
@@ -12,11 +12,11 @@ import (
 // A Species is a high-level classifier in bactdb.
 type Species struct {
 	Id          int64     `json:"id,omitempty"`
-	GenusId     int64     `json:"genus_id"`
-	SpeciesName string    `json:"species_name"`
-	CreatedAt   time.Time `json:"created_at"`
-	UpdatedAt   time.Time `json:"updated_at"`
-	DeletedAt   time.Time `json:"deleted_at"`
+	GenusId     int64     `db:"genus_id" json:"genus_id"`
+	SpeciesName string    `db:"species_name" json:"species_name"`
+	CreatedAt   time.Time `db:"created_at" json:"created_at"`
+	UpdatedAt   time.Time `db:"updated_at" json:"updated_at"`
+	DeletedAt   time.Time `db:"deleted_at" json:"deleted_at"`
 }
 
 // SpeciesService interacts with the species-related endpoints in bactdb's API.
diff --git a/models/users.go b/models/users.go
index e398295..d7a526d 100644
--- a/models/users.go
+++ b/models/users.go
@@ -12,10 +12,10 @@ import (
 // A User is a person that has administrative access to bactdb.
 type User struct {
 	Id        int64     `json:"id,omitempty"`
-	UserName  string    `sql:"size:100" json:"user_name"`
-	CreatedAt time.Time `json:"created_at"`
-	UpdatedAt time.Time `json:"updated_at"`
-	DeletedAt time.Time `json:"deleted_at"`
+	UserName  string    `json:"user_name"`
+	CreatedAt time.Time `db:"created_at" json:"created_at"`
+	UpdatedAt time.Time `db:"updated_at" json:"updated_at"`
+	DeletedAt time.Time `db:"deleted_at" json:"deleted_at"`
 }
 
 // UsersService interacts with the user-related endpoints in bactdb's API.