Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Allows generator to specify migrations directory. References #2960.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3101 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit c2bb269cd5c0b2aa42b9206a0994db4e92a24b27 1 parent cd8686b
Jeremy Kemper jeremy authored
2  railties/CHANGELOG
View
@@ -1,6 +1,6 @@
*SVN*
-* Introducing the session_migration generator. Creates an add_session_table migration. #2958 [Rick Olson]
+* Introducing the session_migration generator. Creates an add_session_table migration. Allows generator to specify migrations directory. #2958, #2960 [Rick Olson]
* Update to Prototype 1.4.0_rc4. Closes #2943 (old Array.prototype.reverse behavior can be obtained by passing false as an argument). [Sam Stephenson]
11 railties/lib/rails_generator/commands.rb
View
@@ -56,8 +56,12 @@ def readme(*args)
end
protected
+ def migration_directory(relative_path)
+ directory(@migration_directory = relative_path)
+ end
+
def existing_migrations(file_name)
- Dir.glob("db/migrate/[0-9]*_#{file_name}.rb")
+ Dir.glob("#{@migration_directory}/[0-9]*_#{file_name}.rb")
end
def migration_exists?(file_name)
@@ -65,7 +69,7 @@ def migration_exists?(file_name)
end
def current_migration_number
- Dir.glob('db/migrate/[0-9]*.rb').inject(0) do |max, file_path|
+ Dir.glob("#{@migration_directory}/[0-9]*.rb").inject(0) do |max, file_path|
n = File.basename(file_path).split('_', 2).first.to_i
if n > max then n else max end
end
@@ -305,6 +309,7 @@ def readme(*relative_sources)
# When creating a migration, it knows to find the first available file in db/migrate and use the migration.rb template.
def migration_template(relative_source, relative_destination, template_options = {})
+ migration_directory relative_destination
raise "Another migration is already named #{file_name}: #{existing_migrations(file_name).first}" if migration_exists?(file_name)
template(relative_source, "#{relative_destination}/#{next_migration_string}_#{file_name}.rb", template_options)
end
@@ -418,6 +423,7 @@ def complex_template(*args)
# When deleting a migration, it knows to delete every file named "[0-9]*_#{file_name}".
def migration_template(relative_source, relative_destination, template_options = {})
+ migration_directory relative_destination
raise "There is no migration named #{file_name}" unless migration_exists?(file_name)
existing_migrations(file_name).each do |file_path|
file(relative_source, file_path, template_options)
@@ -457,6 +463,7 @@ def readme(*args)
end
def migration_template(relative_source, relative_destination, options = {})
+ migration_directory relative_destination
logger.migration_template file_name
end
end
1  railties/lib/rails_generator/generators/components/migration/migration_generator.rb
View
@@ -1,7 +1,6 @@
class MigrationGenerator < Rails::Generator::NamedBase
def manifest
record do |m|
- m.directory 'db/migrate'
m.migration_template 'migration.rb', 'db/migrate'
end
end
1  railties/lib/rails_generator/generators/components/session_migration/session_migration_generator.rb
View
@@ -6,7 +6,6 @@ def initialize(runtime_args, runtime_options = {})
def manifest
record do |m|
- m.directory 'db/migrate'
m.migration_template 'migration.rb', 'db/migrate'
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.