From 8dc3e2a3fb1bdbb0bc2832f8454f87ee3cadee0c Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 24 Apr 2015 08:23:28 -0800 Subject: [PATCH] Rename genbank and accession --- migrations/00004_AddStrain_up.sql | 4 ++-- strains.go | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/migrations/00004_AddStrain_up.sql b/migrations/00004_AddStrain_up.sql index aac7e1e..3b84484 100644 --- a/migrations/00004_AddStrain_up.sql +++ b/migrations/00004_AddStrain_up.sql @@ -6,8 +6,8 @@ CREATE TABLE strains ( species_id BIGINT NOT NULL, strain_name TEXT NOT NULL, type_strain BOOLEAN NOT NULL, - accession_banks TEXT NULL, - genbank_embl_ddb TEXT NULL, + accession_numbers TEXT NULL, + genbank TEXT NULL, isolated_from TEXT NULL, notes TEXT NULL, author_id BIGINT NOT NULL, diff --git a/strains.go b/strains.go index 8c715f6..9a69c14 100644 --- a/strains.go +++ b/strains.go @@ -21,18 +21,18 @@ func init() { // StrainBase is what the DB expects to see for inserts/updates type StrainBase struct { - Id int64 `json:"id,omitempty"` - SpeciesId int64 `db:"species_id" json:"-"` - StrainName string `db:"strain_name" json:"strainName"` - TypeStrain bool `db:"type_strain" json:"typeStrain"` - AccessionBanks string `db:"accession_banks" json:"accessionBanks"` - GenbankEmblDdb NullString `db:"genbank_embl_ddb" json:"genbankEmblDdb"` - IsolatedFrom NullString `db:"isolated_from" json:"isolatedFrom"` - Notes NullString `db:"notes" json:"notes"` - AuthorId int64 `db:"author_id" json:"author"` - CreatedAt time.Time `db:"created_at" json:"createdAt"` - UpdatedAt time.Time `db:"updated_at" json:"updatedAt"` - DeletedAt NullTime `db:"deleted_at" json:"deletedAt"` + Id int64 `json:"id,omitempty"` + SpeciesId int64 `db:"species_id" json:"-"` + StrainName string `db:"strain_name" json:"strainName"` + TypeStrain bool `db:"type_strain" json:"typeStrain"` + AccessionNumbers string `db:"accession_numbers" json:"accessionNumbers"` + Genbank NullString `db:"genbank" json:"genbank"` + IsolatedFrom NullString `db:"isolated_from" json:"isolatedFrom"` + Notes NullString `db:"notes" json:"notes"` + AuthorId int64 `db:"author_id" json:"author"` + CreatedAt time.Time `db:"created_at" json:"createdAt"` + UpdatedAt time.Time `db:"updated_at" json:"updatedAt"` + DeletedAt NullTime `db:"deleted_at" json:"deletedAt"` } // Strain & StrainJSON(s) are what ember expects to see