active_record_inline_schema 0.5.7 → 0.5.9

data/CHANGELOG

@@ -1,3 +1,23 @@
+0.5.9 / 2012-07-26
+
+* Bug fixes
+
+  * Don't try to use ActiveRecord::Base.checkout with SQLite - it causes "Could not find table" errors
+
+0.5.8 / 2012-07-26
+
+* Breaking changes
+
+  * No longer automatically adds inheritance columns - you should specify them like "col :type"
+
+* Enhancements
+
+  * A bit more testing of how primary keys work.
+
+* Notes
+
+  * Something is going horribly wrong with SQLite support - lots of "Could not find table" errors. Hoping we can revisit this when sqlite3 gem 1.3.7 comes out.
+
 0.5.7 / 2012-06-22
 
 * Bug fix

data/lib/active_record_inline_schema/config.rb

@@ -28,50 +28,44 @@ class ActiveRecordInlineSchema::Config
       primary_key_column.type != :primary_key
     end
 
-    unless non_standard_primary_key
+    if non_standard_primary_key
+      if postgresql? or sqlite?
+        primary_key_column.options[:null] = false
+      end
+    else
       add_ideal_column :id, :type => :primary_key
     end
 
+    table_definition = ActiveRecord::ConnectionAdapters::TableDefinition.new connection
+    ideal_columns.each do |ideal_column|
+      ideal_column.inject table_definition
+    end
+
     # Table doesn't exist, create it
     unless connection.table_exists? model.table_name
+      create_table_options ||= DEFAULT_CREATE_TABLE_OPTIONS[database_type]
 
-      if mysql?
-        create_table_options ||= DEFAULT_CREATE_TABLE_OPTIONS[database_type]
-      end
+      statements = []
+      statements << "CREATE TABLE #{model.quoted_table_name} (#{table_definition.to_sql}) #{create_table_options}"
 
-      table_definition = ::ActiveRecord::ConnectionAdapters::TableDefinition.new connection
-      ideal_columns.each do |ideal_column|
-        ideal_column.inject table_definition
+      if non_standard_primary_key
+        if postgresql?
+          statements << %{ALTER TABLE #{model.quoted_table_name} ADD PRIMARY KEY (#{model.quoted_primary_key})}
+        elsif mysql?
+          k = model.quoted_primary_key
+          statements.first.sub! /#{k}([^\)]+)\)([^\),]*)/, "#{k}\\1) PRIMARY KEY"
+        end
       end
 
-      # 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 #{model.quoted_table_name} (#{table_definition.to_sql}) #{create_table_options}"
-
-      if sqlite?
-        connection.execute create_sql
-        if non_standard_primary_key
-          add_ideal_index model.primary_key, :unique => true
-        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 #{model.quoted_table_name} ADD PRIMARY KEY (#{model.quoted_primary_key})"
-        end
-      elsif mysql?
-        if non_standard_primary_key
-          k = connection.quote_column_name(model.primary_key)
-          create_sql.sub! /#{k}([^\)]+)\)([^\),]*)/, "#{k}\\1) PRIMARY KEY"
-        end
-        connection.execute create_sql
+      statements.each do |sql|
+        connection.execute sql
       end
       safe_reset_column_information
     end
 
-    # Add to schema inheritance column if necessary
-    if model.descendants.any? and not find_ideal_column(model.inheritance_column)
-      add_ideal_column model.inheritance_column, :type => :string
+    if non_standard_primary_key and sqlite?
+      # make sure this doesn't get deleted later
+      add_ideal_index model.primary_key, :unique => true
     end
 
     # Remove fields from db no longer in schema
@@ -128,11 +122,6 @@ class ActiveRecordInlineSchema::Config
     safe_reset_column_information
   end
 
-  def clear
-    @ideal_columns = ::Set.new
-    @ideal_indexes = ::Set.new
-  end
-
   private
 
   def find_ideal_column(name)
@@ -177,14 +166,11 @@ class ActiveRecordInlineSchema::Config
   end
 
   def connection
-    unless model.connection.active?
-      raise ::RuntimeError, %{[active_record_inline_schema] Must connect to database before running ActiveRecord::Base.auto_upgrade!}
-    end
     model.connection
   end
 
   def database_type
-    if mysql?
+    @database_type ||= if mysql?
       :mysql
     elsif postgresql?
       :postgresql

data/lib/active_record_inline_schema/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordInlineSchema
-  VERSION = "0.5.7"
+  VERSION = "0.5.9"
 end

data/spec/models.rb

@@ -34,6 +34,7 @@ class Pet < ActiveRecord::Base
   include SpecHelper
 
   col :name
+  col :type
   add_index :name
 end
 class Dog < Pet; end
@@ -103,6 +104,11 @@ class Pet5 < ActiveRecord::Base
   col :id, :type => :integer
 end
 
+class Pet6 < ActiveRecord::Base
+  include SpecHelper
+  col :yesno, :type => :boolean
+end
+
 case ENV['DB_ADAPTER']
 when 'mysql'
   class CustomMysql < ActiveRecord::Base

data/spec/shared_examples.rb

@@ -42,6 +42,11 @@ describe ActiveRecordInlineSchema do
     end
   end
 
+  it "supports boolean columns" do
+    Pet6.auto_upgrade!
+    Pet6.columns_hash['yesno'].type.must_equal :boolean
+  end
+
   it 'has #key,col,property,attribute inside model' do
     (!!ActiveRecord::Base.connection.table_exists?(Post.table_name)).must_equal false
     (!!ActiveRecord::Base.connection.table_exists?(Category.table_name)).must_equal false
@@ -56,19 +61,6 @@ describe ActiveRecordInlineSchema do
     post.title.must_equal 'foo'
     post.body.must_equal 'bar'
     post.category.must_equal category
-
-
-    # Remove a column
-    Post.inline_schema_config.clear
-    Post.class_eval do
-      col :name
-      col :category_id, :type => :integer
-    end
-    Post.auto_upgrade!
-    post = Post.first
-    post.name.must_be_nil
-    post.category.must_equal category
-    post.wont_respond_to :title
   end
 
   it 'has indexes inside model' do

data/spec/sqlite3_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../spec_helper.rb', __FILE__)
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:', :pool => 32)
 
 # require 'logger'
 # ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new($stdout)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_inline_schema
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport