complete database

config/database.yml

@@ -14,15 +14,12 @@ default: &default
 development:
 development:
   <<: *default
   <<: *default
   username: root
   username: root
-  password: 
+  password: lalili1005
   database: VeNJOB_development
   database: VeNJOB_development
 
 
 # Warning: The database defined as "test" will be erased and
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 # Do not set this db to the same as development or production.
-test:
-  <<: *default
-  database: VeNJOB_test
 
 
 production:
 production:
   <<: *default
   <<: *default

db/migrate/20210709041223_create_companies_cities.rb

 class CreateCompaniesCities < ActiveRecord::Migration[6.1]
 class CreateCompaniesCities < ActiveRecord::Migration[6.1]
   def change
   def change
     create_table :companies_cities do |t|
     create_table :companies_cities do |t|
-      t.references :companie, null: false, foreign_key: true
+      t.references :company, null: false, foreign_key: true
       t.references :city, null: false, foreign_key: true
       t.references :city, null: false, foreign_key: true
 
 
       t.timestamps
       t.timestamps

db/schema.rb

@@ -52,12 +52,12 @@ ActiveRecord::Schema.define(version: 2021_07_09_043354) do
   end
   end
 
 
   create_table "companies_cities", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
   create_table "companies_cities", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.bigint "companie_id", null: false
+    t.bigint "company_id", null: false
     t.bigint "city_id", null: false
     t.bigint "city_id", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.index ["city_id"], name: "index_companies_cities_on_city_id"
     t.index ["city_id"], name: "index_companies_cities_on_city_id"
-    t.index ["companie_id"], name: "index_companies_cities_on_companie_id"
+    t.index ["company_id"], name: "index_companies_cities_on_company_id"
   end
   end
 
 
   create_table "favorite_jobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
   create_table "favorite_jobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -131,7 +131,7 @@ ActiveRecord::Schema.define(version: 2021_07_09_043354) do
   add_foreign_key "cities_jobs", "cities"
   add_foreign_key "cities_jobs", "cities"
   add_foreign_key "cities_jobs", "jobs"
   add_foreign_key "cities_jobs", "jobs"
   add_foreign_key "companies_cities", "cities"
   add_foreign_key "companies_cities", "cities"
-  add_foreign_key "companies_cities", "companies", column: "companie_id"
+  add_foreign_key "companies_cities", "companies"
   add_foreign_key "favorite_jobs", "jobs"
   add_foreign_key "favorite_jobs", "jobs"
   add_foreign_key "favorite_jobs", "users"
   add_foreign_key "favorite_jobs", "users"
   add_foreign_key "history_jobs", "jobs"
   add_foreign_key "history_jobs", "jobs"