schema_plus 0.3.4 → 0.4.0

data/README.rdoc

@@ -176,6 +176,7 @@ take advantage of auto-creation of foreign keys, you can re-enable it:
 == History
 
 * Recent Release notes:
+    * 0.4.0 - add :force for create_view (suggested by greglazarev[https://github.com/greglazarev]).  cleanups by betelgeuse[https://github.com/betelgeuse]
     * 0.3.4 - bug fix: regression causing :default => false to be ignored
     * 0.3.3 - bug fix: properly handle boolean defaults in mysql
     * 0.3.2 - bug fix: make sure rake db:schema:load initializes schema_plus 

data/Rakefile

@@ -49,7 +49,7 @@ task :build_postgresql_databases => 'postgresql:build_databases'
 task :drop_postgresql_databases => 'postgresql:drop_databases'
 task :rebuild_postgresql_databases => 'postgresql:rebuild_databases'
 
-MYSQL_DB_USER = 'schema_plus'
+MYSQL_DB_USER = ENV.fetch('MYSQL_DB_USER', 'schema_plus')
 namespace :mysql do
   desc 'Build the MySQL test databases'
   task :build_databases do

data/lib/schema_plus/active_record/connection_adapters/abstract_adapter.rb

@@ -54,8 +54,10 @@ module SchemaPlus
           extend(SchemaPlus::ActiveRecord::ForeignKeys)
         end
 
-        # Create a view given the SQL definition
-        def create_view(view_name, definition)
+        # Create a view given the SQL definition.  Specify :force => true
+        # to first drop the view if it already exists.
+        def create_view(view_name, definition, options={})
+          execute "DROP VIEW IF EXISTS #{quote_table_name(view_name)}" if options[:force]
           execute "CREATE VIEW #{quote_table_name(view_name)} AS #{definition}"
         end
 

data/lib/schema_plus/active_record/connection_adapters/mysql_adapter.rb

@@ -1,7 +1,7 @@
 module SchemaPlus
   module ActiveRecord
     module ConnectionAdapters
-      # SchemaPlus includes a MySQL implementation of the AbstractAdapater
+      # SchemaPlus includes a MySQL implementation of the AbstractAdapter
       # extensions.  (This works with both the <tt>mysql</t> and
       # <tt>mysql2</tt> gems.)
       module MysqlAdapter

data/lib/schema_plus/active_record/connection_adapters/sqlite3_adapter.rb

@@ -10,7 +10,7 @@ module SchemaPlus
         end
       end
 
-      # SchemaPlus includes an Sqlite3 implementation of the AbstractAdapater
+      # SchemaPlus includes an Sqlite3 implementation of the AbstractAdapter
       # extensions.  
       module Sqlite3Adapter
 

data/lib/schema_plus/active_record/schema_dumper.rb

@@ -53,7 +53,7 @@ module SchemaPlus
 
         @connection.views.each do |view_name|
           definition = @connection.view_definition(view_name)
-          @table_dumps[view_name] = "  create_view #{view_name.inspect}, #{definition.inspect}\n"
+          @table_dumps[view_name] = "  create_view #{view_name.inspect}, #{definition.inspect}, :force => true\n"
         end
 
         re_view_referent = %r{(?:(?i)FROM|JOIN) \S*\b(#{(@table_dumps.keys).join('|')})\b}

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

data/spec/views_spec.rb

@@ -47,8 +47,8 @@ describe ActiveRecord do
 
 
     it "should be included in schema dump" do
-      dump.should match(%r{create_view "a_ones", "SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1}i)
-      dump.should match(%r{create_view "ab_ones", "SELECT .*s.* FROM .*a_ones.* WHERE .*b.* = 1}i)
+      dump.should match(%r{create_view "a_ones", "SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1.*, :force => true}i)
+      dump.should match(%r{create_view "ab_ones", "SELECT .*s.* FROM .*a_ones.* WHERE .*b.* = 1.*, :force => true}i)
     end
 
     it "should be included in schema dump in dependency order" do
@@ -67,6 +67,28 @@ describe ActiveRecord do
       dump.should_not match(%r{#{connection.quote_table_name(db)}[.]})
     end
 
+    context "duplicate view creation" do
+      around(:each) do |example|
+        migration.suppress_messages do
+          begin
+            migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=1)')
+            example.run
+          ensure
+            migration.drop_view('dupe_me')
+          end
+        end
+      end
+
+
+      it "should raise an error by default" do
+        expect {migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=2)')}.should raise_error ActiveRecord::StatementInvalid
+      end
+
+      it "should override existing definition if :force true" do
+        migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=2)', :force => true)
+        connection.view_definition('dupe_me').should =~ %r{WHERE .*a.*=.*2}i
+      end
+    end
 
     if SchemaPlusHelpers.mysql?
       context "in mysql" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70148459617200 !ruby/object:Gem::Requirement
+  requirement: &70249441590660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70148459617200
+  version_requirements: *70249441590660
 - !ruby/object:Gem::Dependency
   name: valuable
-  requirement: &70148459616780 !ruby/object:Gem::Requirement
+  requirement: &70249441590200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70148459616780
+  version_requirements: *70249441590200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70148459616280 !ruby/object:Gem::Requirement
+  requirement: &70249441589680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70148459616280
+  version_requirements: *70249441589680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70148459615860 !ruby/object:Gem::Requirement
+  requirement: &70249441589180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148459615860
+  version_requirements: *70249441589180
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70148459615400 !ruby/object:Gem::Requirement
+  requirement: &70249441588700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148459615400
+  version_requirements: *70249441588700
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &70148459614980 !ruby/object:Gem::Requirement
+  requirement: &70249441588240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148459614980
+  version_requirements: *70249441588240
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70148459614560 !ruby/object:Gem::Requirement
+  requirement: &70249441587820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148459614560
+  version_requirements: *70249441587820
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70148459614140 !ruby/object:Gem::Requirement
+  requirement: &70249441587360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148459614140
+  version_requirements: *70249441587360
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
-  requirement: &70148459613720 !ruby/object:Gem::Requirement
+  requirement: &70249441586940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148459613720
+  version_requirements: *70249441586940
 description: ! 'SchemaPlus is an ActiveRecord extension that provides enhanced capabilities
   for schema definition and querying, including: enhanced and more DRY index capabilities,
   support and automation for foreign key constraints, and support for views.'
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: schema_plus
-rubygems_version: 1.8.12
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Enhances ActiveRecord schema mechanism, including more DRY index creation
@@ -236,4 +236,3 @@ test_files:
 - spec/support/matchers/reference.rb
 - spec/support/reference.rb
 - spec/views_spec.rb
-has_rdoc: