Remove the untenanted database

app/models/identity.rb

@@ -1,4 +1,4 @@
-class Identity < UntenantedRecord
+class Identity < ApplicationRecord
   include Transferable
 
   has_many :memberships, dependent: :destroy

app/models/magic_link.rb

@@ -1,4 +1,4 @@
-class MagicLink < UntenantedRecord
+class MagicLink < ApplicationRecord
   CODE_LENGTH = 6
   EXPIRATION_TIME = 15.minutes
 

app/models/membership.rb

@@ -1,4 +1,4 @@
-class Membership < UntenantedRecord
+class Membership < ApplicationRecord
   include EmailAddressChangeable
 
   belongs_to :identity, touch: true

app/models/session.rb

@@ -1,3 +1,3 @@
-class Session < UntenantedRecord
+class Session < ApplicationRecord
   belongs_to :identity
 end

app/models/untenanted_record.rb

@@ -1,4 +0,0 @@
-class UntenantedRecord < ActiveRecord::Base
-  self.abstract_class = true
-  connects_to database: { writing: :untenanted }
-end

config/database.yml

@@ -1,25 +1,23 @@
 default: &default
-  adapter: trilogy
+  adapter: sqlite3
-  host: localhost:33384
-  user: root
   pool: 50
   timeout: 5000
 
 development:
   primary:
     <<: *default
-    database: fizzy_development
+    database: storage/fizzy_development.sqlite3
   cable:
     <<: *default
-    database: fizzy_development_cable
+    database: storage/development_cable.sqlite3
     migrations_paths: db/cable_migrate
   cache:
     <<: *default
-    database: fizzy_development_cache
+    database: storage/development_cache.sqlite3
     migrations_paths: db/cache_migrate
   queue:
     <<: *default
-    database: fizzy_development_queue
+    database: storage/development_queue.sqlite3
     migrations_paths: db/queue_migrate
 
 # Warning: The database defined as "test" will be erased and
@@ -28,24 +26,23 @@ development:
 test:
   primary:
     <<: *default
-    database: fizzy_test
+    database: storage/fizzy_test.sqlite3
 
 production: &production
   primary:
     <<: *default
-    adapter: beamer
+    database: storage/fizzy_<%= Rails.env %>.sqlite3
-    database: fizzy_<%= Rails.env %>
   cable:
     <<: *default
-    database: fizzy_<% Rails.env %>_cable.sqlite3
+    database: storage/production_cable.sqlite3
     migrations_paths: db/cable_migrate
   cache:
     <<: *default
-    database: fizzy_<% Rails.env %>_cache.sqlite3
+    database: storage/production_cache.sqlite3
     migrations_paths: db/cache_migrate
   queue:
     <<: *default
-    database: fizzy_<% Rails.env %>_queue.sqlite3
+    database: storage/production_queue.sqlite3
     migrations_paths: db/queue_migrate
 
 beta: *production

db/schema.rb

@@ -262,6 +262,35 @@ ActiveRecord::Schema[8.2].define(version: 2025_11_06_154151) do
     t.index ["tag_id"], name: "index_filters_tags_on_tag_id"
   end
 
+  create_table "identities", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.string "email_address", null: false
+    t.datetime "updated_at", null: false
+    t.index ["email_address"], name: "index_identities_on_email_address", unique: true
+  end
+
+  create_table "magic_links", force: :cascade do |t|
+    t.string "code", null: false
+    t.datetime "created_at", null: false
+    t.datetime "expires_at", null: false
+    t.integer "identity_id"
+    t.datetime "updated_at", null: false
+    t.index ["code"], name: "index_magic_links_on_code", unique: true
+    t.index ["expires_at"], name: "index_magic_links_on_expires_at"
+    t.index ["identity_id"], name: "index_magic_links_on_identity_id"
+  end
+
+  create_table "memberships", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.integer "identity_id", null: false
+    t.string "join_code"
+    t.string "tenant", null: false
+    t.datetime "updated_at", null: false
+    t.index ["identity_id"], name: "index_memberships_on_identity_id"
+    t.index ["tenant", "identity_id"], name: "index_memberships_on_tenant_and_identity_id", unique: true
+    t.index ["tenant"], name: "index_memberships_on_user_tenant_and_user_id"
+  end
+
   create_table "mentions", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.integer "mentionee_id", null: false
@@ -455,6 +484,8 @@ ActiveRecord::Schema[8.2].define(version: 2025_11_06_154151) do
   add_foreign_key "columns", "boards"
   add_foreign_key "comments", "cards"
   add_foreign_key "events", "boards"
+  add_foreign_key "magic_links", "identities"
+  add_foreign_key "memberships", "identities"
   add_foreign_key "mentions", "users", column: "mentionee_id"
   add_foreign_key "mentions", "users", column: "mentioner_id"
   add_foreign_key "notification_bundles", "users"

db/untenanted_schema.rb

@@ -1,55 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# This file is the source Rails uses to define your schema when running `bin/rails
-# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
-# be faster and is potentially less error prone than running all of your
-# migrations from scratch. Old migrations may fail to apply correctly if those
-# migrations use external dependencies or application code.
-#
-# It's strongly recommended that you check this file into your version control system.
-
-ActiveRecord::Schema[8.2].define(version: 2025_11_05_082803) do
-  create_table "identities", force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.string "email_address", null: false
-    t.datetime "updated_at", null: false
-    t.index ["email_address"], name: "index_identities_on_email_address", unique: true
-  end
-
-  create_table "magic_links", force: :cascade do |t|
-    t.string "code", null: false
-    t.datetime "created_at", null: false
-    t.datetime "expires_at", null: false
-    t.integer "identity_id"
-    t.datetime "updated_at", null: false
-    t.index ["code"], name: "index_magic_links_on_code", unique: true
-    t.index ["expires_at"], name: "index_magic_links_on_expires_at"
-    t.index ["identity_id"], name: "index_magic_links_on_identity_id"
-  end
-
-  create_table "memberships", force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.integer "identity_id", null: false
-    t.string "join_code"
-    t.string "tenant", null: false
-    t.datetime "updated_at", null: false
-    t.index ["identity_id"], name: "index_memberships_on_identity_id"
-    t.index ["tenant", "identity_id"], name: "index_memberships_on_tenant_and_identity_id", unique: true
-    t.index ["tenant"], name: "index_memberships_on_user_tenant_and_user_id"
-  end
-
-  create_table "sessions", force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.integer "identity_id", null: false
-    t.string "ip_address"
-    t.datetime "updated_at", null: false
-    t.string "user_agent"
-    t.index ["identity_id"], name: "index_sessions_on_identity_id"
-  end
-
-  add_foreign_key "magic_links", "identities"
-  add_foreign_key "memberships", "identities"
-  add_foreign_key "sessions", "identities"
-end