From e3889b9a062d3a4f1055cd8463a4ec686923efe9 Mon Sep 17 00:00:00 2001 From: James Smith Date: Fri, 23 Apr 2021 00:04:18 +0100 Subject: [PATCH 1/3] add schema AR model and migration --- app/models/schema.rb | 2 ++ db/migrate/20210422223019_create_schemas.rb | 9 +++++++++ db/schema.rb | 8 +++++++- spec/models/schema_spec.rb | 5 +++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 app/models/schema.rb create mode 100644 db/migrate/20210422223019_create_schemas.rb create mode 100644 spec/models/schema_spec.rb diff --git a/app/models/schema.rb b/app/models/schema.rb new file mode 100644 index 00000000..d690d4ba --- /dev/null +++ b/app/models/schema.rb @@ -0,0 +1,2 @@ +class Schema < ActiveRecord::Base +end diff --git a/db/migrate/20210422223019_create_schemas.rb b/db/migrate/20210422223019_create_schemas.rb new file mode 100644 index 00000000..582425f5 --- /dev/null +++ b/db/migrate/20210422223019_create_schemas.rb @@ -0,0 +1,9 @@ +class CreateSchemas < ActiveRecord::Migration + def change + create_table :schemas do |t| + t.string :url + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 4dfbb168..b05cf4a6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,6 +11,12 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 20210422223019) do + + create_table "schemas", force: :cascade do |t| + t.string "url" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end end diff --git a/spec/models/schema_spec.rb b/spec/models/schema_spec.rb new file mode 100644 index 00000000..f7dc3bcf --- /dev/null +++ b/spec/models/schema_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +RSpec.describe Schema, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 2f4c3f5eb1d7933b22e20d10f4c22762cace705b Mon Sep 17 00:00:00 2001 From: James Smith Date: Fri, 23 Apr 2021 00:24:04 +0100 Subject: [PATCH 2/3] Move pg to default gem group --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b8588988..ba7b5c5c 100644 --- a/Gemfile +++ b/Gemfile @@ -29,12 +29,12 @@ gem 'jbuilder', '~> 2.9' gem 'sdoc', '~> 2.1', group: :doc gem 'foreman', '~> 0.87' +gem 'pg', '~> 1.2' group :production do gem 'thin', '~> 1.8' gem 'rails_12factor', '~> 0.0' gem 'puma', '~> 5.2' - gem 'pg', '~> 1.2' end group :development, :test do From da257c1d7e9b7aebe797c08242c2acf193e4cb13 Mon Sep 17 00:00:00 2001 From: James Smith Date: Fri, 23 Apr 2021 00:37:38 +0100 Subject: [PATCH 3/3] use pg < 1.0 for Rails 4 See https://github.com/rails/rails/issues/31673 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ba7b5c5c..cf29aa5d 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ gem 'jbuilder', '~> 2.9' gem 'sdoc', '~> 2.1', group: :doc gem 'foreman', '~> 0.87' -gem 'pg', '~> 1.2' +gem 'pg', '~> 0.18' group :production do gem 'thin', '~> 1.8' diff --git a/Gemfile.lock b/Gemfile.lock index d189a413..08b15555 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -522,7 +522,7 @@ GEM open_uri_redirections (0.2.1) optimist (3.0.1) origin (2.3.1) - pg (1.2.3) + pg (0.21.0) poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) @@ -822,7 +822,7 @@ DEPENDENCIES mongo (~> 2.1)! mongoid (~> 5.1) nokogiri (~> 1.10) - pg (~> 1.2) + pg (~> 0.18) poltergeist (~> 1.6) pry (~> 0.14) puma (~> 5.2)