redhillonrails_core 1.1.0 → 1.1.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+1.1.1
+    * quote values for foreign key definition
 1.1.0
     * standard gem layout (no more RedHillConsulting module)
     * got rid of table comments support

data/lib/redhillonrails_core/active_record/connection_adapters/foreign_key_definition.rb

@@ -4,6 +4,10 @@ module RedhillonrailsCore
       class ForeignKeyDefinition < Struct.new(:name, :table_name, :column_names, :references_table_name, :references_column_names, :on_update, :on_delete, :deferrable)
         ACTIONS = { :cascade => "CASCADE", :restrict => "RESTRICT", :set_null => "SET NULL", :set_default => "SET DEFAULT", :no_action => "NO ACTION" }.freeze
 
+        def initialize(name, table_name, column_names, references_table_name, references_column_names, on_update = nil, on_delete = nil, deferrable = nil)
+          super(name, unquote(table_name), unquote(column_names), unquote(references_table_name), unquote(references_column_names), on_update, on_delete, deferrable)
+        end
+
         def to_dump
           dump = "add_foreign_key"
           dump << " #{table_name.inspect}, [#{Array(column_names).collect{ |name| name.inspect }.join(', ')}]"
@@ -16,14 +20,48 @@ module RedhillonrailsCore
         end
 
         def to_sql
-          sql = name ? "CONSTRAINT #{name} " : ""
-          sql << "FOREIGN KEY (#{Array(column_names).join(", ")}) REFERENCES #{references_table_name} (#{Array(references_column_names).join(", ")})"
+          sql = name ? "CONSTRAINT #{quote(name)} " : ""
+          sql << "FOREIGN KEY (#{quoted_column_names.join(", ")}) REFERENCES #{quoted_references_table_name} (#{quoted_references_column_names.join(", ")})"
           sql << " ON UPDATE #{ACTIONS[on_update]}" if on_update
           sql << " ON DELETE #{ACTIONS[on_delete]}" if on_delete
           sql << " DEFERRABLE" if deferrable
           sql
         end
+
         alias :to_s :to_sql
+
+        def quoted_column_names
+          Array(column_names).collect { |name| ::ActiveRecord::Base.connection.quote_column_name(name) }
+        end
+
+        def quoted_references_column_names
+          Array(references_column_names).collect { |name| ::ActiveRecord::Base.connection.quote_column_name(name) }
+        end
+
+        def quoted_table_name
+          ::ActiveRecord::Base.connection.quote_table_name(table_name)
+        end
+        
+        def quoted_references_table_name
+          ::ActiveRecord::Base.connection.quote_table_name(references_table_name)
+        end
+
+        def quote(name)
+          ::ActiveRecord::Base.connection.quote(name)
+        end
+
+        def unquote(names)
+          if names.is_a?(Array)
+            names.collect { |name| __unqoute(name) }
+          else
+            __unqoute(names)
+          end
+        end
+
+        def __unqoute(value)
+          value.to_s.sub(/^["`](.*)["`]$/, '\1')
+        end
+
       end
     end
   end

data/redhillonrails_core.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{redhillonrails_core}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Micha\305\202 \305\201omnicki"]
-  s.date = %q{2011-01-09}
+  s.authors = ["Michał Łomnicki"]
+  s.date = %q{2011-01-10}
   s.description = %q{Adds support in ActiveRecord for foreign_keys, complex indexes and other database-related stuff. Easily create foreign_keys, complex indexes and views.}
   s.email = %q{michal.lomnicki@gmail.com}
   s.extra_rdoc_files = [
@@ -17,57 +17,91 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     "CHANGELOG",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "init.rb",
-     "lib/redhillonrails_core.rb",
-     "lib/redhillonrails_core/active_record/base.rb",
-     "lib/redhillonrails_core/active_record/connection_adapters/abstract_adapter.rb",
-     "lib/redhillonrails_core/active_record/connection_adapters/column.rb",
-     "lib/redhillonrails_core/active_record/connection_adapters/foreign_key_definition.rb",
-     "lib/redhillonrails_core/active_record/connection_adapters/index_definition.rb",
-     "lib/redhillonrails_core/active_record/connection_adapters/mysql_adapter.rb",
-     "lib/redhillonrails_core/active_record/connection_adapters/mysql_column.rb",
-     "lib/redhillonrails_core/active_record/connection_adapters/postgresql_adapter.rb",
-     "lib/redhillonrails_core/active_record/connection_adapters/sqlite3_adapter.rb",
-     "lib/redhillonrails_core/active_record/connection_adapters/table_definition.rb",
-     "lib/redhillonrails_core/active_record/schema.rb",
-     "lib/redhillonrails_core/active_record/schema_dumper.rb",
-     "redhillonrails_core.gemspec"
+    "MIT-LICENSE",
+    "README.rdoc",
+    "init.rb",
+    "lib/redhillonrails_core.rb",
+    "lib/redhillonrails_core/active_record/base.rb",
+    "lib/redhillonrails_core/active_record/connection_adapters/abstract_adapter.rb",
+    "lib/redhillonrails_core/active_record/connection_adapters/column.rb",
+    "lib/redhillonrails_core/active_record/connection_adapters/foreign_key_definition.rb",
+    "lib/redhillonrails_core/active_record/connection_adapters/index_definition.rb",
+    "lib/redhillonrails_core/active_record/connection_adapters/mysql_adapter.rb",
+    "lib/redhillonrails_core/active_record/connection_adapters/mysql_column.rb",
+    "lib/redhillonrails_core/active_record/connection_adapters/postgresql_adapter.rb",
+    "lib/redhillonrails_core/active_record/connection_adapters/sqlite3_adapter.rb",
+    "lib/redhillonrails_core/active_record/connection_adapters/table_definition.rb",
+    "lib/redhillonrails_core/active_record/schema.rb",
+    "lib/redhillonrails_core/active_record/schema_dumper.rb",
+    "redhillonrails_core.gemspec",
+    "spec/connections/mysql/connection.rb",
+    "spec/connections/mysql2/connection.rb",
+    "spec/connections/postgresql/connection.rb",
+    "spec/connections/sqlite3/connection.rb",
+    "spec/connections/sqlite3/redhillonrails_core.db",
+    "spec/foreign_key_definition_spec.rb",
+    "spec/foreign_key_spec.rb",
+    "spec/index_definition_spec.rb",
+    "spec/index_spec.rb",
+    "spec/models/comment.rb",
+    "spec/models/post.rb",
+    "spec/models/user.rb",
+    "spec/schema/schema.rb",
+    "spec/schema_dumper_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/reference.rb"
   ]
   s.homepage = %q{http://github.com/mlomnicki/redhillonrails_core}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Adds support in ActiveRecord for foreign_keys, complex indexes and other database-related stuff}
   s.test_files = [
+    "spec/connections/mysql/connection.rb",
+    "spec/connections/mysql2/connection.rb",
+    "spec/connections/postgresql/connection.rb",
+    "spec/connections/sqlite3/connection.rb",
+    "spec/foreign_key_definition_spec.rb",
+    "spec/foreign_key_spec.rb",
+    "spec/index_definition_spec.rb",
+    "spec/index_spec.rb",
+    "spec/models/comment.rb",
+    "spec/models/post.rb",
+    "spec/models/user.rb",
     "spec/schema/schema.rb",
-     "spec/foreign_key_spec.rb",
-     "spec/schema_dumper_spec.rb",
-     "spec/connections/mysql2/connection.rb",
-     "spec/connections/postgresql/connection.rb",
-     "spec/connections/sqlite3/connection.rb",
-     "spec/connections/mysql/connection.rb",
-     "spec/support/reference.rb",
-     "spec/index_definition_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/index_spec.rb",
-     "spec/models/user.rb",
-     "spec/models/post.rb",
-     "spec/models/comment.rb"
+    "spec/schema_dumper_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/reference.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<pg>, [">= 0"])
+      s.add_development_dependency(%q<mysql>, [">= 0"])
+      s.add_development_dependency(%q<mysql2>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3-ruby>, ["~> 1.3.1"])
     else
       s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<pg>, [">= 0"])
+      s.add_dependency(%q<mysql>, [">= 0"])
+      s.add_dependency(%q<mysql2>, [">= 0"])
+      s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.1"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<pg>, [">= 0"])
+    s.add_dependency(%q<mysql>, [">= 0"])
+    s.add_dependency(%q<mysql2>, [">= 0"])
+    s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.1"])
   end
 end
 

data/spec/foreign_key_definition_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'models/user'
+
+describe "Foreign Key definition" do
+
+  let(:definition) { RedhillonrailsCore::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new("posts_user_fkey", :posts, :user, :users, :id) }
+
+  it "it is dumped to sql with quoted values" do
+    definition.to_sql.should == %Q{CONSTRAINT #{quote('posts_user_fkey')} FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')})}
+  end
+
+  def quote_table_name(table)
+    ActiveRecord::Base.connection.quote_table_name(table)
+  end
+
+  def quote_column_name(column)
+    ActiveRecord::Base.connection.quote_column_name(column)
+  end
+
+  def quote(name)
+    ActiveRecord::Base.connection.quote(name)
+  end
+
+end

data/spec/support/reference.rb

@@ -14,7 +14,7 @@ module RedhillonrailsCoreMatchers
       if @references_table_name
         @result = @model.foreign_keys.select do |fk|
           fk.references_table_name == @references_table_name && 
-            fk.references_column_names == @references_column_names
+            @references_column_names.empty? ? true : fk.references_column_names == @references_column_names
         end
       else
         @result = @model.foreign_keys
@@ -26,7 +26,7 @@ module RedhillonrailsCoreMatchers
             (@on_delete ? fk.on_delete == @on_delete : true)
         end
       else
-        !!@result
+        !@result.empty?
       end
     end
 
@@ -34,7 +34,7 @@ module RedhillonrailsCoreMatchers
       target_column_names = @column_names.present? ? "(#{@column_names.join(', ')})" : "" 
       destinantion_column_names = @references_table_name ? "#{@references_table_name}(#{@references_column_names.join(', ')})" : "anything"
       invert = should_not ? 'not' : ''
-      "Expected #{@model.table_name}#{target_column_names} #{invert} to reference #{destinantion_column_names}"
+      "Expected #{@model.table_name}#{target_column_names} to #{invert} reference #{destinantion_column_names}"
     end
 
     def failure_message_for_should_not

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - "Micha\xC5\x82 \xC5\x81omnicki"
@@ -14,13 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 +01:00
+date: 2011-01-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -28,7 +28,90 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        version: "1.5"
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: pg
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mysql
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: mysql2
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 description: Adds support in ActiveRecord for foreign_keys, complex indexes and other database-related stuff. Easily create foreign_keys, complex indexes and views.
 email: michal.lomnicki@gmail.com
 executables: []
@@ -56,23 +139,42 @@ files:
 - lib/redhillonrails_core/active_record/schema.rb
 - lib/redhillonrails_core/active_record/schema_dumper.rb
 - redhillonrails_core.gemspec
+- spec/connections/mysql/connection.rb
+- spec/connections/mysql2/connection.rb
+- spec/connections/postgresql/connection.rb
+- spec/connections/sqlite3/connection.rb
+- spec/connections/sqlite3/redhillonrails_core.db
+- spec/foreign_key_definition_spec.rb
+- spec/foreign_key_spec.rb
+- spec/index_definition_spec.rb
+- spec/index_spec.rb
+- spec/models/comment.rb
+- spec/models/post.rb
+- spec/models/user.rb
+- spec/schema/schema.rb
+- spec/schema_dumper_spec.rb
+- spec/spec_helper.rb
+- spec/support/reference.rb
 has_rdoc: true
 homepage: http://github.com/mlomnicki/redhillonrails_core
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 428669949
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -82,22 +184,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Adds support in ActiveRecord for foreign_keys, complex indexes and other database-related stuff
 test_files: 
-- spec/schema/schema.rb
-- spec/foreign_key_spec.rb
-- spec/schema_dumper_spec.rb
+- spec/connections/mysql/connection.rb
 - spec/connections/mysql2/connection.rb
 - spec/connections/postgresql/connection.rb
 - spec/connections/sqlite3/connection.rb
-- spec/connections/mysql/connection.rb
-- spec/support/reference.rb
+- spec/foreign_key_definition_spec.rb
+- spec/foreign_key_spec.rb
 - spec/index_definition_spec.rb
-- spec/spec_helper.rb
 - spec/index_spec.rb
-- spec/models/user.rb
-- spec/models/post.rb
 - spec/models/comment.rb
+- spec/models/post.rb
+- spec/models/user.rb
+- spec/schema/schema.rb
+- spec/schema_dumper_spec.rb
+- spec/spec_helper.rb
+- spec/support/reference.rb