Compare commits

..

No commits in common. "16adb83240bc295ac3791739a96d5b36411f60fb" and "e1e3ef94beb807649d7426238d78357dbbe1b788" have entirely different histories.

11 changed files with 3 additions and 91 deletions

View File

@ -1,3 +0,0 @@
class Exercise < ApplicationRecord
belongs_to :type
end

View File

@ -1,5 +0,0 @@
class ExerciseType < ApplicationRecord
validates :name,
:unit,
presence: true
end

View File

@ -1,3 +0,0 @@
class Food < ApplicationRecord
validates :name, presence: true
end

View File

@ -3,14 +3,12 @@ default: &default
encoding: unicode encoding: unicode
# For details on connection pooling, see Rails configuration guide # For details on connection pooling, see Rails configuration guide
# https://guides.rubyonrails.org/configuring.html#database-pooling # https://guides.rubyonrails.org/configuring.html#database-pooling
host: localhost pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
username: postgres username: soc
password: postgres
development: development:
<<: *default <<: *default
database: soc_development database: soc_development
username: postgres
password: postgres password: postgres
test: test:
@ -22,4 +20,3 @@ production:
database: soc_production database: soc_production
password: <%= ENV["POSTGRES_PASSWORD"] %> password: <%= ENV["POSTGRES_PASSWORD"] %>
host: <%= ENV.fetch("DB_HOST") { 'localhost' } %> host: <%= ENV.fetch("DB_HOST") { 'localhost' } %>
username: soc

View File

@ -1,9 +0,0 @@
class CreateFoods < ActiveRecord::Migration[7.1]
def change
create_table :foods do |t|
t.text :name, null: false
t.timestamps
end
end
end

View File

@ -1,10 +0,0 @@
class CreateExerciseTypes < ActiveRecord::Migration[7.1]
def change
create_table :exercise_types do |t|
t.text :name, null: false
t.text :unit, null: false
t.timestamps
end
end
end

View File

@ -1,11 +0,0 @@
class CreateExercises < ActiveRecord::Migration[7.1]
def change
create_table :exercises do |t|
t.references :exercise_type, null: false, foreign_key: true
t.time :at
t.float :amount, null: false
t.timestamps
end
end
end

25
db/schema.rb generated
View File

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.1].define(version: 2023_12_29_114145) do ActiveRecord::Schema[7.1].define(version: 2023_10_19_192600) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -63,28 +63,6 @@ ActiveRecord::Schema[7.1].define(version: 2023_12_29_114145) do
t.index ["user_id"], name: "index_blog_posts_on_user_id" t.index ["user_id"], name: "index_blog_posts_on_user_id"
end end
create_table "exercise_types", force: :cascade do |t|
t.text "name", null: false
t.text "unit", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "exercises", force: :cascade do |t|
t.bigint "exercise_type_id", null: false
t.time "at"
t.float "amount", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["exercise_type_id"], name: "index_exercises_on_exercise_type_id"
end
create_table "foods", force: :cascade do |t|
t.text "name", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "microposts", force: :cascade do |t| create_table "microposts", force: :cascade do |t|
t.bigint "user_id", null: false t.bigint "user_id", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
@ -128,6 +106,5 @@ ActiveRecord::Schema[7.1].define(version: 2023_12_29_114145) do
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
add_foreign_key "blog_posts", "users" add_foreign_key "blog_posts", "users"
add_foreign_key "exercises", "exercise_types"
add_foreign_key "microposts", "users" add_foreign_key "microposts", "users"
end end

View File

@ -1,7 +0,0 @@
running:
name: Running
unit: km
cycling:
name: Running
unit: km

View File

@ -1,9 +0,0 @@
one:
exercise_type: running
at: 2023-12-29 11:41:45
amount: 5
two:
exercise_type: cycling
at: 2023-12-29 11:41:45
amount: 10.5

View File

@ -1,5 +0,0 @@
one:
name: Pizza
two:
name: Banana