mini_record-compat 0.3.0 → 0.3.1

data/README.md

@@ -1,5 +1,10 @@
-[![Build Status](https://secure.travis-ci.org/DAddYE/mini_record.png)](http://travis-ci.org/DAddYE/mini_record)
+# DEPRECATED
 
+The old `mini_record-compat` gem has been deprecated in favor of [`active_record_inline_schema`](https://github.com/seamusabshere/active_record_inline_schema).
+
+Please use [`active_record_inline_schema`](https://github.com/seamusabshere/active_record_inline_schema) or [original mini_record](https://github.com/DAddYE/mini_record) instead of `mini_record-compat`. 
+
+# DEPRECATED
 
 MiniRecord is a micro extension for our `ActiveRecord` gem.
 With MiniRecord you can add the ability to create columns outside the default `schema.rb`, directly

data/Rakefile

@@ -30,7 +30,7 @@ task :test_each_db_adapter do
     puts
     puts "#{'*'*10} Running #{db_adapter} tests"
     puts
-    puts `bundle exec rake test TEST=spec/#{db_adapter}_spec.rb`
+    puts `bundle exec rake test DB_ADAPTER=#{db_adapter} TEST=spec/#{db_adapter}_spec.rb`
   end
 end
 

data/lib/mini_record/auto_schema.rb

@@ -27,7 +27,11 @@ module MiniRecord
         options = args.extract_options!
         type = options.delete(:as) || options.delete(:type) || :string
         args.each do |column_name|
-          table_definition.send(type, column_name, options)
+          if table_definition.respond_to?(type)
+            table_definition.send(type, column_name, options)
+          else
+            table_definition.column(column_name, type, options)
+          end
           column_name = table_definition.columns[-1].name
           case index_name = options.delete(:index)
             when Hash
@@ -104,23 +108,31 @@ module MiniRecord
           
           # avoid using connection.create_table because in 3.0.x it ignores table_definition
           # and it also is too eager about adding a primary key column
-          create_sql = "CREATE TABLE "
-          create_sql << "#{quoted_table_name} ("
-          create_sql << table_definition.to_sql
-          create_sql << ") #{create_table_options}"
-          connection.execute create_sql
+          create_sql = "CREATE TABLE #{quoted_table_name} (#{table_definition.to_sql}) #{create_table_options}"
           
-          if non_standard_primary_key
-            if sqlite?
+          if sqlite?
+            connection.execute create_sql
+            if non_standard_primary_key
               add_index primary_key, :unique => true
-            elsif mysql? or postgresql?
-            # can't use add_index method because it won't let you do "PRIMARY KEY"
+            end
+          elsif postgresql?
+            connection.execute create_sql
+            if non_standard_primary_key
+              # can't use add_index method because it won't let you do "PRIMARY KEY"
               connection.execute "ALTER TABLE #{quoted_table_name} ADD PRIMARY KEY (#{quoted_primary_key})"
-            else
-              raise RuntimeError, "mini_record doesn't support non-standard primary keys for the #{connection.adapter_name} adapter!"
             end
+          elsif mysql?
+            if non_standard_primary_key
+              # only string keys are supported
+              create_sql.sub! %r{#{connection.quote_column_name(primary_key)} varchar\(255\)([^,\)]*)}, "#{connection.quote_column_name(primary_key)} varchar(255)\\1 PRIMARY KEY"
+              create_sql.sub! 'DEFAULT NULLPRIMARY KEY', 'PRIMARY KEY'
+            end
+            connection.execute create_sql
           end
 
+          if connection.respond_to?(:schema_cache)
+            connection.schema_cache.clear!
+          end
           reset_column_information
         end
 
@@ -164,7 +176,9 @@ module MiniRecord
             new_attr = {}
 
             # First, check if the field type changed
-            if fields_in_schema[field].type.to_sym != fields_in_db[field].type.to_sym
+            if (fields_in_schema[field].type.to_sym != fields_in_db[field].type.to_sym) and (fields_in_schema[field].type.to_sym != fields_in_db[field].sql_type.to_sym)
+              # $stderr.puts "A(#{field}) - #{fields_in_schema[field].type.to_sym}"
+              # $stderr.puts "B(#{field}) - #{fields_in_db[field].type.to_sym} - #{fields_in_db[field].sql_type.to_sym}"
               changed = true
             end
 
@@ -178,6 +192,8 @@ module MiniRecord
             fields_in_schema[field].each_pair do |att,value|
               next if att == :type or att == :base or att == :name # special cases
               if !value.nil? && value != fields_in_db[field].send(att)
+                # $stderr.puts "C(#{att}) - #{value.inspect}"
+                # $stderr.puts "D(#{att}) - #{fields_in_db[field].send(att).inspect}"
                 new_attr[att] = value
                 changed = true
               end
@@ -203,6 +219,9 @@ module MiniRecord
         end
 
         # Reload column information
+        if connection.respond_to?(:schema_cache)
+          connection.schema_cache.clear!
+        end
         reset_column_information
       end
     end # ClassMethods

data/lib/mini_record/version.rb

@@ -1,3 +1,3 @@
 module MiniRecord
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/mini_record.gemspec

@@ -8,12 +8,9 @@ Gem::Specification.new do |s|
   s.authors     = ["Davide D'Agostino", "Seamus Abshere"]
   s.email       = ["d.dagostino@lipsiasoft.com", "seamus@abshere.net"]
   s.homepage    = "https://github.com/seamusabshere/mini_record"
-  s.summary     = %q{Alternate gem published by Seamus Abshere for ActiveRecord 3.0 support. MiniRecord is a micro gem that allow you to write schema inside your model as you can do in DataMapper.}
-  s.description = %q{
-    With it you can add the ability to create columns outside the default schema, directly
-    in your model in a similar way that you just know in others projects
-    like  DataMapper or  MongoMapper.
-  }.gsub(/^ {4}/, '')
+  spec = %q{DEPRECATED. Use active_record_inline_schema or original mini_record gem instead.}
+  s.summary     = spec
+  s.description = spec
 
   # s.rubyforge_project = "mini_record"
 
@@ -23,6 +20,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "activerecord", ">=3"
+  # s.add_runtime_dependency "activerecord", "3.0.12"
+  # s.add_runtime_dependency "activerecord", "3.1.3"
+  # s.add_runtime_dependency "activerecord", "3.2.2"
 
   # dev dependencies appear to be in the Gemfile
 end

data/spec/models.rb

@@ -41,18 +41,26 @@ class Cat < Pet; end
 class Vegetable < ActiveRecord::Base
   include SpecHelper
 
-  set_primary_key :latin_name
+  self.primary_key = 'latin_name'
   
   col :latin_name
   col :common_name
 end
 
+class Gender < ActiveRecord::Base
+  include SpecHelper
+
+  self.primary_key = 'name'
+  
+  col :name
+end
+
 class User < ActiveRecord::Base
   include SpecHelper
+  self.inheritance_column = 'role' # messed up in 3.2.2
   col :name
   col :surname
   col :role
-  set_inheritance_column :role
 end
 class Administrator < User; end
 class Customer < User; end
@@ -68,3 +76,18 @@ class AutomobileMakeModelYearVariant < ActiveRecord::Base
   col :make_model_year_name
   add_index :make_model_year_name
 end
+
+case ENV['DB_ADAPTER']
+when 'mysql'
+  class CustomMysql < ActiveRecord::Base
+    include SpecHelper
+    col :varb, :type => 'varbinary(255)'
+    col :varc, :type => 'varchar(255)'
+  end
+when 'postgresql'
+  class CustomPostgresql < ActiveRecord::Base
+    include SpecHelper
+    col :inet, :type => 'inet'
+    col :bytea, :type => 'bytea'
+  end
+end

data/spec/shared_examples.rb

@@ -1,7 +1,7 @@
 describe MiniRecord do
   before do
     ActiveRecord::Base.descendants.each do |active_record|
-      ActiveRecord::Base.connection.drop_table active_record.table_name if active_record.table_exists?
+      ActiveRecord::Base.connection.drop_table active_record.table_name rescue nil
     end
   end
 
@@ -194,6 +194,11 @@ describe MiniRecord do
     end
   end
   
+  it 'properly creates tables with one column, a string primary key' do
+    Gender.auto_upgrade!
+    Gender.column_names.must_equal ['name']
+  end
+  
   it 'is idempotent' do
     ActiveRecord::Base.descendants.each do |active_record|
       active_record.auto_upgrade!
@@ -211,6 +216,21 @@ describe MiniRecord do
       [ active_record.db_columns, active_record.db_indexes ].must_equal before    
     end
   end
+
+  case ENV['DB_ADAPTER']
+  when 'mysql'
+    it "takes custom types" do
+      CustomMysql.auto_upgrade!
+      CustomMysql.columns_hash['varb'].sql_type.must_equal 'varbinary(255)'
+      CustomMysql.columns_hash['varc'].sql_type.must_equal 'varchar(255)'
+    end
+  when 'postgresql'
+    it "takes custom types" do
+      CustomPostgresql.auto_upgrade!
+      CustomPostgresql.columns_hash['inet'].sql_type.must_equal 'inet'
+      CustomPostgresql.columns_hash['bytea'].sql_type.must_equal 'bytea'
+    end
+  end
   
   private
   

data/spec/spec_helper.rb

@@ -3,6 +3,10 @@ require 'bundler/setup'
 require 'mini_record'
 require 'minitest/autorun'
 
+# require 'logger'
+# ActiveRecord::Base.logger = Logger.new($stderr)
+# ActiveRecord::Base.logger.level = Logger::DEBUG
+
 module SpecHelper
   def self.included(base)
     base.extend(ClassMethods)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_record-compat
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000Z
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153710260 !ruby/object:Gem::Requirement
+  requirement: &2166679180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,9 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153710260
-description: ! "\nWith it you can add the ability to create columns outside the default
-  schema, directly\nin your model in a similar way that you just know in others projects\nlike
-  \ DataMapper or  MongoMapper.\n  "
+  version_requirements: *2166679180
+description: DEPRECATED. Use active_record_inline_schema or original mini_record gem
+  instead.
 email:
 - d.dagostino@lipsiasoft.com
 - seamus@abshere.net
@@ -68,12 +67,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Alternate gem published by Seamus Abshere for ActiveRecord 3.0 support. MiniRecord
-  is a micro gem that allow you to write schema inside your model as you can do in
-  DataMapper.
+summary: DEPRECATED. Use active_record_inline_schema or original mini_record gem instead.
 test_files:
 - spec/models.rb
 - spec/mysql_spec.rb
@@ -81,3 +78,4 @@ test_files:
 - spec/shared_examples.rb
 - spec/spec_helper.rb
 - spec/sqlite3_spec.rb
+has_rdoc: