@@ -18,4 +18,5 @@ * Updated tests to include new table to support union test 0.7.0 - * Updated dependency versions to get on ActiveRecord 2.x. May not be compatible with Rails versions less than 2.x. \ No newline at end of file + * Updated dependency versions to get on ActiveRecord 2.x. May not be compatible with Rails versions less than 2.x. + * Add nonview_tables support to *all* of the adapters (was missing from Postgres and SQLServer) \ No newline at end of file CHANGELOG @@ -6,7 +6,7 @@ module ActiveRecord true end - def tables(name = nil) #:nodoc: + def nonview_tables(name = nil) #:nodoc: tables = [] execute("SELECT TABLE_NAME FROM USER_TABLES", name).each { |row| tables << row[0] } tables lib/rails_sql_views/connection_adapters/oci_adapter.rb @@ -6,7 +6,7 @@ module ActiveRecord true end - def tables(name = nil) #:nodoc: + def nonview_tables(name = nil) #:nodoc: tables = [] execute("SELECT TABLE_NAME FROM USER_TABLES", name).each { |row| tables << row[0] } tables lib/rails_sql_views/connection_adapters/oracle_adapter.rb @@ -6,6 +6,17 @@ module ActiveRecord true end + def nonview_tables(name = nil) + q = <<-SQL + SELECT table_name, table_type + FROM information_schema.tables + WHERE table_schema IN (#{schemas}) + AND table_type = 'BASE_TABLE' + SQL + + query(q, name).map { |row| row[0] } + end + def views(name = nil) #:nodoc: q = <<-SQL SELECT table_name, table_type lib/rails_sql_views/connection_adapters/postgresql_adapter.rb @@ -6,6 +6,12 @@ module ActiveRecord true end + # Get all of the non-view tables from the currently connected schema + def nonview_tables(name = nil) + # this is untested + select_values("SELECT table_name FROM information_schema.tables", name) + end + # Returns all the view names from the currently connected schema. def views(name = nil) select_values("SELECT table_name FROM information_schema.views", name) lib/rails_sql_views/connection_adapters/sqlserver_adapter.rb @@ -25,6 +25,7 @@ If you would like to implement an adapter, it should go in lib/rails_sql_views/c of the other adapters currently implemented. Every adapter must implement the following methods: supports_views? + nonview_tables(name = nil) views(name = nil) view_select_statement(view, name=nil) test/README f5a2b22f0f9f772a9f5809b6a4201c49ca3bb2cc Anthony Eden anthonyeden@gmail.com http://github.com/aeden/rails_sql_views/commit/8f9060ff185b5708edcc8a10a33560c94e535021 8f9060ff185b5708edcc8a10a33560c94e535021 2008-11-04T12:28:57-08:00 2008-11-04T12:28:57-08:00 added nonview_tables where missing. need to get tests running again 9234e83c83ac913c11c973e3fd88e628121211fa Anthony Eden anthonyeden@gmail.com