add use of flush option in doctrine:clear_* task

everzet · Mar 10, 2013 · 5a73699 · 5a73699
1 parent a70e94d
commit 5a73699
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/capifony_symfony2.rb b/lib/capifony_symfony2.rb
@@ -114,6 +114,9 @@ def self.load_into(configuration)
 
         # Doctrine custom entity manager
         set :doctrine_em,           false
+
+        # Use --flush option in doctrine:clear_* task 
+        set :doctrine_clear_use_flush_option, false
 
         # Symfony2 version
         set(:symfony_version)       { guess_symfony_version }

diff --git a/lib/symfony2/doctrine.rb b/lib/symfony2/doctrine.rb
@@ -5,23 +5,23 @@
       task :clear_metadata, :roles => :app, :except => { :no_release => true } do
         capifony_pretty_print "--> Clearing Doctrine metadata cache"
 
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-metadata --env=#{symfony_env_prod}#{doctrine_em_flag}'"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-metadata --env=#{symfony_env_prod}#{doctrine_em_flag}"+ if doctrine_clear_use_flush_option then " --flush" else "" end +"'"
         capifony_puts_ok
       end
 
       desc "Clears all query cache for a entity manager"
       task :clear_query, :roles => :app, :except => { :no_release => true } do
         capifony_pretty_print "--> Clearing Doctrine query cache"
 
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-query --env=#{symfony_env_prod}#{doctrine_em_flag}'"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-query --env=#{symfony_env_prod}#{doctrine_em_flag}"+ if doctrine_clear_use_flush_option then " --flush" else "" end +"'"
         capifony_puts_ok
       end
 
       desc "Clears result cache for a entity manager"
       task :clear_result, :roles => :app, :except => { :no_release => true } do
         capifony_pretty_print "--> Clearing Doctrine result cache"
 
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-result --env=#{symfony_env_prod}#{doctrine_em_flag}'"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:cache:clear-result --env=#{symfony_env_prod}#{doctrine_em_flag}"+ if doctrine_clear_use_flush_option then " --flush" else "" end +"'"
         capifony_puts_ok
       end
     end