Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix migration file for rails 5 #985

Closed
wants to merge 15 commits into from
Closed

fix migration file for rails 5 #985

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4e47770
fix migration file for rails 5
Aug 24, 2017
aa4f22e
Update migration_generator.rb
Aug 24, 2017
7ba04f9
Update migration.rb.erb
Aug 24, 2017
911b165
Update migration_generator.rb
Aug 24, 2017
45eb637
Update application_owner_generator.rb
Aug 24, 2017
1325e21
Update and rename add_owner_to_application_migration.rb to add_owner_…
Aug 24, 2017
9b2e5d5
Update add_previous_refresh_token_to_access_tokens.rb
Aug 24, 2017
2476822
Update previous_refresh_token_generator.rb
Aug 24, 2017
7509e89
Rename add_previous_refresh_token_to_access_tokens.rb to add_previous…
Aug 24, 2017
b0111c7
Update application_owner_generator.rb
Aug 24, 2017
24fbb75
Update previous_refresh_token_generator.rb
Aug 24, 2017
38fd452
Update application_owner_generator.rb
Aug 24, 2017
0cf2cf4
Update previous_refresh_token_generator.rb
Aug 24, 2017
d6bdbe1
Update application_owner_generator.rb
Oct 17, 2017
bfc00b3
Update application_owner_generator.rb
Oct 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/generators/doorkeeper/application_owner_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ class Doorkeeper::ApplicationOwnerGenerator < Rails::Generators::Base

def application_owner
migration_template(
'add_owner_to_application_migration.rb',
'db/migrate/add_owner_to_application.rb'
'add_owner_to_application_migration.rb.erb',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

'db/migrate/add_owner_to_application.rb',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

migration_version: migration_version
)
end

Expand Down
4 changes: 2 additions & 2 deletions lib/generators/doorkeeper/migration_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ class Doorkeeper::MigrationGenerator < ::Rails::Generators::Base

def install
migration_template(
'migration.rb',
'db/migrate/create_doorkeeper_tables.rb',
"migration.rb.erb",
"db/migrate/create_doorkeeper_tables.rb",
migration_version: migration_version
)
end
Expand Down
5 changes: 3 additions & 2 deletions lib/generators/doorkeeper/previous_refresh_token_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ def self.next_migration_number(path)
def previous_refresh_token
if no_previous_refresh_token_column?
migration_template(
'add_previous_refresh_token_to_access_tokens.rb',
'db/migrate/add_previous_refresh_token_to_access_tokens.rb'
'add_previous_refresh_token_to_access_tokens.rb.erb',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

'db/migrate/add_previous_refresh_token_to_access_tokens.rb',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

migration_version: migration_version
)
end
end
Expand Down
2 changes: 1 addition & 1 deletion ...tes/add_owner_to_application_migration.rb → ...add_owner_to_application_migration.rb.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddOwnerToApplication < ActiveRecord::Migration
class AddOwnerToApplication < ActiveRecord::Migration<%= migration_version %>
def change
add_column :oauth_applications, :owner_id, :integer, null: true
add_column :oauth_applications, :owner_type, :string, null: true
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/doorkeeper/templates/add_previous_refresh_token_to_access_tokens.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddPreviousRefreshTokenToAccessTokens < ActiveRecord::Migration
class AddPreviousRefreshTokenToAccessTokens < ActiveRecord::Migration<%= migration_version %>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unterminated string meets end of file

def change
add_column(
:oauth_access_tokens,
Expand Down
0 ...erators/doorkeeper/templates/migration.rb → ...ors/doorkeeper/templates/migration.rb.erb
View file
Open in desktop
File renamed without changes.