From da31a3d6e4458f41f2628c814813c9bc646a9039 Mon Sep 17 00:00:00 2001 From: djezzzl Date: Tue, 24 Dec 2024 10:40:30 +0100 Subject: [PATCH] Fix --- .github/workflows/integrations.yml | 2 +- rails7-example/Gemfile | 2 -- rails7-example/config/database.yml | 2 +- rails7-example/db/schema.rb | 11 +++-------- rails7-example/db/secondary_schema.rb | 9 ++------- 5 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml index c6b1cc2..5439361 100644 --- a/.github/workflows/integrations.yml +++ b/.github/workflows/integrations.yml @@ -16,7 +16,7 @@ jobs: rails-version: 'rails-example' - ruby-version: '3.0' rails-version: 'rails6-example' - - ruby-version: '3.2.0' + - ruby-version: '3.2' rails-version: 'rails7-example' - ruby-version: '3.3' rails-version: 'rails8-example' diff --git a/rails7-example/Gemfile b/rails7-example/Gemfile index 0d6a267..195e08e 100644 --- a/rails7-example/Gemfile +++ b/rails7-example/Gemfile @@ -1,8 +1,6 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.2.0" - gem 'database_consistency', path: '../', group: :development, require: false gem "pg" diff --git a/rails7-example/config/database.yml b/rails7-example/config/database.yml index d5715df..35f5ae0 100644 --- a/rails7-example/config/database.yml +++ b/rails7-example/config/database.yml @@ -1,5 +1,5 @@ default: &default - adapter: postgresql + adapter: sqlite3 pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> timeout: 5000 username: test diff --git a/rails7-example/db/schema.rb b/rails7-example/db/schema.rb index ad91cca..74fff65 100644 --- a/rails7-example/db/schema.rb +++ b/rails7-example/db/schema.rb @@ -11,9 +11,6 @@ # It's strongly recommended that you check this file into your version control system. ActiveRecord::Schema[7.0].define(version: 2021_12_29_101039) do - # These are extensions that must be enabled in order to support this database - enable_extension "plpgsql" - create_table "companies", force: :cascade do |t| t.boolean "available", default: false, null: false t.boolean "active" @@ -29,10 +26,8 @@ t.datetime "updated_at", null: false end - create_table "organizations", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end +# Could not dump table "organizations" because of following StandardError +# Unknown type 'bigserial' for column 'id' create_table "users", force: :cascade do |t| t.string "email", null: false @@ -41,7 +36,7 @@ t.string "address" t.string "code", null: false t.string "slug", null: false - t.bigint "company_id", null: false + t.integer "company_id", limit: 8, null: false t.integer "country_id" t.integer "organization_id", null: false t.integer "invitable_id", null: false diff --git a/rails7-example/db/secondary_schema.rb b/rails7-example/db/secondary_schema.rb index 9090a7d..1890ccc 100644 --- a/rails7-example/db/secondary_schema.rb +++ b/rails7-example/db/secondary_schema.rb @@ -11,16 +11,11 @@ # It's strongly recommended that you check this file into your version control system. ActiveRecord::Schema[7.0].define(version: 2023_07_22_090559) do - # These are extensions that must be enabled in order to support this database - enable_extension "plpgsql" - create_table "companies", force: :cascade do |t| t.string "name", null: false end - create_table "users", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end +# Could not dump table "users" because of following StandardError +# Unknown type 'uuid' for column 'id' end