ensured_schema 0.1.1 → 0.1.2

data/lib/ensured_schema/ensured_table.rb

@@ -2,6 +2,20 @@ module ActiveRecord
   module ConnectionAdapters
     class EnsuredTable < Table
 
+      def column(column_name, type, options = {})
+        if column_exists?(column_name)
+          unless column_exists?(column_name, type, options)
+            change(column_name, type, options)
+          end
+        else
+          @base.add_column(@table_name, column_name, type, options)
+        end
+      end
+
+      def remove(column_name)
+        super if column_exists?(column_name)
+      end
+
       %w( string text integer float decimal datetime timestamp time date binary boolean ).each do |column_type|
         class_eval <<-EOV
           def #{column_type}(*args)                   # def string(*args)
@@ -18,15 +32,7 @@ module ActiveRecord
           column_def = build_column_definition(name, column_type, options)
           def_options = column_def.members.inject({}){|h, k| h[k.to_sym] = column_def[k]; h;}
           #debugger
-          if column_exists?(name)
-            unless column_exists?(name, column_type, def_options)
-              change(name, column_def.sql_type, options)
-              puts "#{name} has been changed!"
-            end
-          else
-            puts "creating column"
-            @base.add_column(@table_name, name, column_def.sql_type, options)
-          end
+          column(name, column_type.to_sym, def_options)
         end
       end
 

data/lib/ensured_schema/schema_statements.rb

@@ -47,10 +47,8 @@ module ActiveRecord
 
       def table(table_name, options = {}, &block)
         if table_exists?(table_name)
-          puts "table already exists"
           ensure_table(table_name, &block) # what to do about changing table options
         else
-          puts "creating table"
           create_table(table_name, options, &block)
         end
       end

data/lib/ensured_schema/version.rb

@@ -1,3 +1,3 @@
 module EnsuredSchema
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/cases/ensured_schema_test.rb

@@ -20,7 +20,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       @conn.drop_table("testings") if @conn.table_exists?("testings")
     end
 
-    def testings_definition
+    def test_table_definition
       assert_nothing_raised do
         ActiveRecord::Schema.ensure(:version => '1') do
           table(:testings, :id => false, :force => true) do |t|
@@ -42,10 +42,12 @@ if ActiveRecord::Base.connection.supports_migrations?
         ActiveRecord::Schema.ensure(:version => '1') do
           table(:testings, :id => false, :force => true) do |t|
             t.string :test,  :limit => 30, :default => "", :null => false
+            t.column :test2, :string
           end
           table(:testings, :id => false, :force => true) do |t|
             t.expects(:change).never
             t.string :test,  :limit => 30, :default => "", :null => false
+            t.column :test2, :string
           end
         end
       end
@@ -183,6 +185,26 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert @conn.column_exists?(:testings, :test)
     end
 
+    def test_column_is_removed_once
+      assert_nothing_raised do
+        ActiveRecord::Schema.ensure(:version => '1') do
+          table(:testings, :id => false, :force => true) do |t|
+            t.string :test,  :limit => 30, :default => "", :null => false
+            t.string :test2
+            t.remove(:test)
+            t.remove(:test)
+          end
+        end
+
+        ActiveRecord::Schema.ensure(:version => '1') do
+          table(:testings, :id => false, :force => true) do |t|
+            t.remove(:test)
+          end
+        end
+      end
+      assert !@conn.column_exists?(:testings, :test)
+    end
+
     def test_ensure_index
       assert_nothing_raised do
         ActiveRecord::Schema.ensure(:version => '1') do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ensured_schema
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Chris Conley