Skip to content

Commit

Permalink
update annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
nabeta committed Jan 13, 2019
1 parent 89bfb63 commit 40ac98c
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 45 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
environment:
PGHOST: 127.0.0.1
PGUSER: postgres

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
paths:
- ./vendor/bundle
key: v1-dependencies-{{ checksum "Gemfile.lock" }}

# Database setup
- run:
command: dockerize -wait tcp://localhost:5432 -timeout 1m
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: ruby
cache: bundler
rvm:
- 2.3.4
- 2.4.1
- 2.4.5
- 2.5.3
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
Expand Down
6 changes: 3 additions & 3 deletions app/models/inter_library_loan.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def self.initial_state
#
# Table name: inter_library_loans
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# item_id :integer not null
# borrowing_library_id :integer not null
# requested_at :datetime
Expand All @@ -92,6 +92,6 @@ def self.initial_state
# return_shipped_at :datetime
# return_received_at :datetime
# deleted_at :datetime
# created_at :datetime
# updated_at :datetime
# created_at :datetime not null
# updated_at :datetime not null
#
6 changes: 3 additions & 3 deletions app/models/inter_library_loan_transition.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ class InterLibraryLoanTransition < ActiveRecord::Base
#
# Table name: inter_library_loan_transitions
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# to_state :string
# metadata :text default({})
# sort_key :integer
# inter_library_loan_id :integer
# created_at :datetime
# updated_at :datetime
# created_at :datetime not null
# updated_at :datetime not null
# most_recent :boolean not null
#
2 changes: 1 addition & 1 deletion db/migrate/148_create_inter_library_loans.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateInterLibraryLoans < ActiveRecord::Migration[4.2]
class CreateInterLibraryLoans < ActiveRecord::Migration[5.2]
def self.up
create_table :inter_library_loans do |t|
t.integer :item_id, null: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateInterLibraryLoanTransitions < ActiveRecord::Migration[4.2]
class CreateInterLibraryLoanTransitions < ActiveRecord::Migration[5.2]
def change
create_table :inter_library_loan_transitions do |t|
t.string :to_state
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddMostRecentToInterLibraryLoanTransitions < ActiveRecord::Migration[4.2]
class AddMostRecentToInterLibraryLoanTransitions < ActiveRecord::Migration[5.2]
def up
add_column :inter_library_loan_transitions, :most_recent, :boolean, null: true
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddConstraintsToMostRecentForInterLibraryLoanTransitions < ActiveRecord::Migration[4.2]
class AddConstraintsToMostRecentForInterLibraryLoanTransitions < ActiveRecord::Migration[5.2]
disable_ddl_transaction!

def up
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
module Dummy
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 5.1
config.load_defaults 5.2

# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
Expand Down
31 changes: 10 additions & 21 deletions spec/dummy/db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
t.datetime "updated_at"
t.string "attachment_file_name"
t.string "attachment_content_type"
t.integer "attachment_file_size"
t.bigint "attachment_file_size"
t.datetime "attachment_updated_at"
end

Expand Down Expand Up @@ -467,20 +467,20 @@
t.index ["user_id"], name: "index_import_requests_on_user_id"
end

create_table "inter_library_loan_transitions", id: :serial, force: :cascade do |t|
create_table "inter_library_loan_transitions", force: :cascade do |t|
t.string "to_state"
t.text "metadata", default: "{}"
t.integer "sort_key"
t.integer "inter_library_loan_id"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.boolean "most_recent", null: false
t.index ["inter_library_loan_id", "most_recent"], name: "index_inter_library_loan_transitions_parent_most_recent", unique: true, where: "most_recent"
t.index ["inter_library_loan_id"], name: "index_inter_library_loan_transitions_on_inter_library_loan_id"
t.index ["sort_key", "inter_library_loan_id"], name: "index_inter_library_loan_transitions_on_sort_key_and_loan_id", unique: true
end

create_table "inter_library_loans", id: :serial, force: :cascade do |t|
create_table "inter_library_loans", force: :cascade do |t|
t.integer "item_id", null: false
t.integer "borrowing_library_id", null: false
t.datetime "requested_at"
Expand All @@ -489,8 +489,8 @@
t.datetime "return_shipped_at"
t.datetime "return_received_at"
t.datetime "deleted_at"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["borrowing_library_id"], name: "index_inter_library_loans_on_borrowing_library_id"
t.index ["item_id"], name: "index_inter_library_loans_on_item_id"
end
Expand Down Expand Up @@ -595,17 +595,6 @@
t.index ["name"], name: "index_libraries_on_name"
end

create_table "library_group_translations", force: :cascade do |t|
t.integer "library_group_id", null: false
t.string "locale", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.text "login_banner"
t.text "footer_banner"
t.index ["library_group_id"], name: "index_library_group_translations_on_library_group_id"
t.index ["locale"], name: "index_library_group_translations_on_locale"
end

create_table "library_groups", id: :serial, force: :cascade do |t|
t.string "name", null: false
t.text "display_name"
Expand All @@ -628,7 +617,7 @@
t.boolean "csv_charset_conversion", default: false, null: false
t.string "header_logo_file_name"
t.string "header_logo_content_type"
t.integer "header_logo_file_size"
t.bigint "header_logo_file_size"
t.datetime "header_logo_updated_at"
t.text "header_logo_meta"
t.index ["short_name"], name: "index_library_groups_on_short_name"
Expand Down Expand Up @@ -1038,7 +1027,7 @@
t.integer "user_id"
t.string "resource_export_file_name"
t.string "resource_export_content_type"
t.integer "resource_export_file_size"
t.bigint "resource_export_file_size"
t.datetime "resource_export_updated_at"
t.datetime "executed_at"
t.datetime "created_at"
Expand Down Expand Up @@ -1245,7 +1234,7 @@
t.integer "user_id"
t.string "user_export_file_name"
t.string "user_export_content_type"
t.integer "user_export_file_size"
t.bigint "user_export_file_size"
t.datetime "user_export_updated_at"
t.datetime "executed_at"
t.datetime "created_at"
Expand Down
6 changes: 3 additions & 3 deletions spec/fixtures/inter_library_loan_transitions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ inter_library_loan_transition_00007:
#
# Table name: inter_library_loan_transitions
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# to_state :string
# metadata :text default({})
# sort_key :integer
# inter_library_loan_id :integer
# created_at :datetime
# updated_at :datetime
# created_at :datetime not null
# updated_at :datetime not null
# most_recent :boolean not null
#
6 changes: 3 additions & 3 deletions spec/fixtures/inter_library_loans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ inter_library_loan_00007:
#
# Table name: inter_library_loans
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# item_id :integer not null
# borrowing_library_id :integer not null
# requested_at :datetime
Expand All @@ -70,6 +70,6 @@ inter_library_loan_00007:
# return_shipped_at :datetime
# return_received_at :datetime
# deleted_at :datetime
# created_at :datetime
# updated_at :datetime
# created_at :datetime not null
# updated_at :datetime not null
#
6 changes: 3 additions & 3 deletions spec/models/inter_library_loan_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# Table name: inter_library_loans
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# item_id :integer not null
# borrowing_library_id :integer not null
# requested_at :datetime
Expand All @@ -19,6 +19,6 @@
# return_shipped_at :datetime
# return_received_at :datetime
# deleted_at :datetime
# created_at :datetime
# updated_at :datetime
# created_at :datetime not null
# updated_at :datetime not null
#

0 comments on commit 40ac98c

Please sign in to comment.