schema_statements.rb in cauta-desert-0.5.2

- old
+ new

@@ -1,12 +1,15 @@
 ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
   def initialize_schema_migrations_table_with_plugins
     initialize_schema_migrations_table_without_plugins
 
     begin
-      execute "CREATE TABLE #{Desert::PluginMigrations::Migrator.schema_migrations_table_name} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:string)})"
-      plugins_and_versions = select_all("SELECT plugin_name, version from #{Desert::PluginMigrations::Migrator.schema_migrations_table_name}")
+      psm_table = ActiveRecord::Migrator.schema_migrations_table_name
+      unless ActiveRecord::Base.connection.table_exists?(psm_table)
+        execute "CREATE TABLE #{psm_table} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:string)})"
+      end
+      plugins_and_versions = select_all("SELECT plugin_name, version from #{psm_table}")
       plugins_and_versions.each do |plugin_data|
         plugin_name, version = plugin_data["plugin_name"], plugin_data["version"]
         plugin = Desert::Manager.find_plugin(plugin_name)
         migration_versions = Dir["#{plugin.migration_path}/*.rb"].map do |path|
           File.basename(path, ".rb")
@@ -28,6 +31,6 @@
     rescue ActiveRecord::StatementInvalid
       # Schema has been initialized
     end
   end
   alias_method_chain :initialize_schema_migrations_table, :plugins
-end
\ No newline at end of file
+end