From aa2e68a7f4e13db776eafab784a49d86da55f252 Mon Sep 17 00:00:00 2001 From: erik r Date: Tue, 12 Nov 2024 11:22:11 -0500 Subject: [PATCH] updates for local dev environment runnign macos 15.0.1 and new ruby and node and gems --- .nvmrc | 1 + .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 7 ++++--- db/schema.rb | 6 +++--- 5 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..209e3ef --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +20 diff --git a/.ruby-version b/.ruby-version index c939cb5..be94e6f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.0.3 \ No newline at end of file +3.2.2 diff --git a/Gemfile b/Gemfile index fbca204..ae91378 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ gem 'jbuilder', '~> 2.5' # gem 'redis', '~> 3.0' # Use sqlite3 as the database for Active Record -gem "sqlite3", "~> 1.4.2" +gem "sqlite3", "~> 1.5.0" gem 'mysql2' diff --git a/Gemfile.lock b/Gemfile.lock index 80eabda..0a7c75c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,7 +83,7 @@ GEM bootsnap (1.10.3) msgpack (~> 1.2) builder (3.2.4) - byebug (11.0.0) + byebug (11.1.3) cancancan (3.5.0) capistrano (3.17.3) airbrussh (>= 1.0.0) @@ -289,7 +289,8 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.4.2) + sqlite3 (1.5.4) + mini_portile2 (~> 2.8.0) sshkit (1.21.6) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) @@ -357,7 +358,7 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) sprockets-rails - sqlite3 (~> 1.4.2) + sqlite3 (~> 1.5.0) tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) diff --git a/db/schema.rb b/db/schema.rb index b060934..e50128e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -36,7 +36,7 @@ t.string "summary" t.datetime "created_at", precision: nil, null: false t.datetime "updated_at", precision: nil, null: false - t.bigint "primary_location_id" + t.integer "primary_location_id" t.boolean "primary", default: false t.boolean "front_page", default: false, null: false t.string "short_note" @@ -50,7 +50,7 @@ end create_table "permissions", force: :cascade do |t| - t.bigint "user_id" + t.integer "user_id" t.string "role", null: false t.string "subject_class" t.integer "subject_id" @@ -69,7 +69,7 @@ t.boolean "tbd", default: false, null: false t.boolean "closed", default: false, null: false t.string "note" - t.bigint "location_id" + t.integer "location_id" t.index ["close"], name: "index_timetables_on_close" t.index ["date"], name: "index_timetables_on_date" t.index ["location_id", "date"], name: "index_timetables_on_location_id_and_date", unique: true