desert 0.5.3 → 0.5.4

data/CHANGES

@@ -1,3 +1,6 @@
+0.5.4
+- Fixed migration problems when using postgres
+
 0.5.3
 - optimize load_paths, use uniq!
 - correct bad SQL for recording migrations in plugin_schema_migrations
@@ -47,4 +50,3 @@
 0.1.0
 - Fixed [#13346] ActionController::Base.helper raises error when helper is only in plugin
 - Desert does not require files that have been required before Desert was loaded
-  

data/VERSION.yml

@@ -1,2 +1,2 @@
 --- 
-:version: 0.5.3
+:version: 0.5.4

data/lib/desert/plugin_migrations/1.2/extensions/schema_statements.rb

@@ -2,10 +2,8 @@ ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
   def initialize_schema_information_with_plugins
     initialize_schema_information_without_plugins
 
-    begin
+    unless Desert::PluginMigrations::Migrator.legacy_schema_table_exists?
       execute "CREATE TABLE #{Desert::PluginMigrations::Migrator.schema_info_table_name} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:integer)})"
-    rescue ActiveRecord::StatementInvalid
-      # Schema has been initialized
     end
   end
   alias_method_chain :initialize_schema_information, :plugins
@@ -16,7 +14,7 @@ ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
     dump = dump_schema_information_without_plugins
     schema_information << dump if dump
 
-    begin
+    if Desert::PluginMigrations::Migrator.legacy_schema_table_exists?
       plugins = ActiveRecord::Base.connection.select_all("SELECT * FROM #{Desert::PluginMigrations::Migrator.schema_info_table_name}")
       plugins.each do |plugin|
         if (version = plugin['version'].to_i) > 0
@@ -24,11 +22,9 @@ ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
           schema_information << "INSERT INTO #{Desert::PluginMigrations::Migrator.schema_info_table_name} (plugin_name, version) VALUES (#{plugin_name}, #{version})"
         end
       end
-    rescue ActiveRecord::StatementInvalid
-      # No Schema Info
     end
 
     schema_information.join(";\n")
   end
   alias_method_chain :dump_schema_information, :plugins
-end
+end

data/lib/desert/plugin_migrations/1.2/migrator.rb

@@ -3,7 +3,11 @@ module Desert #:nodoc:
     class Migrator < ActiveRecord::Migrator
       class << self
         def current_version #:nodoc:
-          result = ActiveRecord::Base.connection.select_one("SELECT version FROM #{schema_info_table_name} WHERE plugin_name = '#{current_plugin.name}'")
+          if legacy_schema_table_exists?
+            result = ActiveRecord::Base.connection.select_one("SELECT version FROM #{schema_info_table_name} WHERE plugin_name = '#{current_plugin.name}'")
+          else
+            result = nil
+          end
           if result
             result['version'].to_i
           else
@@ -16,11 +20,13 @@ module Desert #:nodoc:
       def set_schema_version(version)
         version = down? ? version.to_i - 1 : version.to_i
 
-        if ActiveRecord::Base.connection.select_one("SELECT version FROM #{self.class.schema_info_table_name} WHERE plugin_name = '#{current_plugin.name}'").nil?
-          # We need to create the entry since it doesn't exist
-          ActiveRecord::Base.connection.execute("INSERT INTO #{self.class.schema_info_table_name} (version, plugin_name) VALUES (#{version},'#{current_plugin.name}')")
-        else
-          ActiveRecord::Base.connection.update("UPDATE #{self.class.schema_info_table_name} SET version = #{version} WHERE plugin_name = '#{current_plugin.name}'")
+        if self.class.legacy_schema_table_exists?
+          if ActiveRecord::Base.connection.select_one("SELECT version FROM #{self.class.schema_info_table_name} WHERE plugin_name = '#{current_plugin.name}'").nil?
+            # We need to create the entry since it doesn't exist
+            ActiveRecord::Base.connection.execute("INSERT INTO #{self.class.schema_info_table_name} (version, plugin_name) VALUES (#{version},'#{current_plugin.name}')")
+          else
+            ActiveRecord::Base.connection.update("UPDATE #{self.class.schema_info_table_name} SET version = #{version} WHERE plugin_name = '#{current_plugin.name}'")
+          end
         end
       end
 

data/lib/desert/plugin_migrations/2.1/extensions/schema_statements.rb

@@ -7,29 +7,29 @@ ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
       unless ActiveRecord::Base.connection.tables.include?(smt)
         execute "CREATE TABLE #{smt} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:string)})"
       end
-      plugins_and_versions = select_all("SELECT plugin_name, version from #{Desert::PluginMigrations::Migrator.schema_info_table_name}")
-      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")
-        end.select do |migration|
-          # Make sure versions don't start with zero, or Integer will interpret them as octal
-          version_from_table_stripped = version.sub(/^0*/, '')
-          migration_version_stripped = migration.split("_").first.sub(/^0*/, '')
-          Integer(migration_version_stripped) <= Integer(version_from_table_stripped)
-        end
-        migration_versions.each do |migration_version|
-          insert_sql = ActiveRecord::Base.send(:sanitize_sql, [
-            "INSERT INTO #{Desert::PluginMigrations::Migrator.schema_migrations_table_name}(plugin_name, version) VALUES(?, ?)",
-            plugin_name,
-            Integer(migration_version.split("_").first.sub(/^0*/, ''))
-          ])
-          execute insert_sql
+      if Desert::PluginMigrations::Migrator.legacy_schema_table_exists?
+        plugins_and_versions = select_all("SELECT plugin_name, version from #{Desert::PluginMigrations::Migrator.schema_info_table_name}")
+        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")
+          end.select do |migration|
+            # Make sure versions don't start with zero, or Integer will interpret them as octal
+            version_from_table_stripped = version.to_s.sub(/^0*/, '')
+            migration_version_stripped = migration.split("_").first.sub(/^0*/, '')
+            Integer(migration_version_stripped) <= Integer(version_from_table_stripped)
+          end
+          migration_versions.each do |migration_version|
+            insert_sql = ActiveRecord::Base.send(:sanitize_sql, [
+              "INSERT INTO #{Desert::PluginMigrations::Migrator.schema_migrations_table_name}(plugin_name, version) VALUES(?, ?)",
+              plugin_name,
+              Integer(migration_version.split("_").first.sub(/^0*/, ''))
+            ])
+            execute insert_sql
+          end
         end
       end
-    rescue ActiveRecord::StatementInvalid
-      # Schema has been initialized
     end
   end
   alias_method_chain :initialize_schema_migrations_table, :plugins

data/lib/desert/plugin_migrations/migrator.rb

@@ -23,7 +23,11 @@ module Desert #:nodoc:
         def schema_migrations_table_name
           ActiveRecord::Base.table_name_prefix + 'plugin_schema_migrations' + ActiveRecord::Base.table_name_suffix
         end
+
+        def legacy_schema_table_exists?
+          ActiveRecord::Base.connection.tables.include? schema_info_table_name
+        end
       end
     end
   end
-end
+end

data/lib/desert/rails/migration.rb

@@ -15,22 +15,13 @@ class ActiveRecord::Migration
       raise ArgumentError, "No plugin found named #{plugin_name}"
     end
 
-    def table_exists?(table_name)
-      vals = select_all("DESC #{table_name}")
-      return true
-    rescue ActiveRecord::StatementInvalid
-      return false
-    end
-
     def column_exists?(table_name, column_name)
-      val = select_one("select #{column_name} from #{table_name}")
-      return true
-    rescue ActiveRecord::StatementInvalid
-      return false
+      !ActiveRecord::Base.connection.columns(table_name).detect {|c| c.name == column_name }.nil?
     end
+    
     def table_exists?(table_name)
       ActiveRecord::Base.connection.tables.include? table_name
     end
   end
   extend DesertMigration
-end
+end

metadata

@@ -1,15 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: desert
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Pivotal Labs
 - Brian Takita
 - Parker Thompson
-- Adam Milligan
-- Joe Moore
-- Josh Susser
+- Adam Milligan, Joe Moore
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -88,18 +91,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: desert
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps.