0
@@ -125,7 +125,7 @@
0
 
0
 Chris Wanstrath, Dr. Nic Williams, K. Adam Christensen, Mike Garey, Bence
0
 Golda, Matt Aimonetti, Charles Brian Quinn, Desi McAdam, James Coglan, Matijs
0
-van Zuijlen, Maria, Brendan Ribera, Todd Willey, Bryan Helmkamp.
0
+van Zuijlen, Maria, Brendan Ribera, Todd Willey, Bryan Helmkamp, Jan Berkel.
0
 
0
 == Usable pagination in the UI
0
 

0
@@ -111,7 +111,11 @@
0
           
0
           unless pager.total_entries
0
             count_query = original_query.sub /\bORDER\s+BY\s+[\w`,\s]+$/mi, ''
0
-            count_query = "SELECT COUNT(*) FROM (#{count_query}) AS count_table"
0
+            count_query = "SELECT COUNT(*) FROM (#{count_query})"
0
+            
0
+            unless ['oracle', 'oci'].include?(self.connection.adapter_name.downcase)
0
+              count_query << ' AS count_table'
0
+            end
0
             # perform the count query
0
             pager.total_entries = count_by_sql(count_query)
0
           end

0
@@ -18,9 +18,9 @@
0
 # Wrap tests that use Mocha and skip if unavailable.
0
 def uses_mocha(test_name)
0
   require 'mocha' unless Object.const_defined?(:Mocha)
0
-  yield
0
 rescue LoadError => load_error
0
-  raise unless load_error.message =~ /mocha/i
0
   $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
0
+else
0
+  yield
0
 end