@@ -1,3 +1,2 @@ - Use pre-existing Adapter#supports_views? where possible -- Rename #nonview_tables to #base_tables TODO @@ -12,11 +12,12 @@ module RailsSqlViews true end - def nonview_tables(name = nil) #:nodoc: + def base_tables(name = nil) #:nodoc: tables = [] execute("SHOW FULL TABLES WHERE TABLE_TYPE='BASE TABLE'").each{|row| tables << row[0]} tables end + alias nonview_tables base_tables def views(name = nil) #:nodoc: views = [] @@ -26,7 +27,7 @@ module RailsSqlViews def structure_dump structure = "" - nonview_tables.each do |table| + base_tables.each do |table| structure += select_one("SHOW CREATE TABLE #{quote_table_name(table)}")["Create Table"] + ";\n\n" end lib/rails_sql_views/connection_adapters/mysql_adapter.rb @@ -6,11 +6,12 @@ module RailsSqlViews true end - def nonview_tables(name = nil) #:nodoc: + def base_tables(name = nil) #:nodoc: tables = [] execute("SELECT TABLE_NAME FROM USER_TABLES", name).each { |row| tables << row[0] } tables end + alias nonview_tables base_tables def views(name = nil) #:nodoc: views = [] lib/rails_sql_views/connection_adapters/oci_adapter.rb @@ -6,11 +6,12 @@ module RailsSqlViews true end - def nonview_tables(name = nil) #:nodoc: + def base_tables(name = nil) #:nodoc: tables = [] execute("SELECT TABLE_NAME FROM USER_TABLES", name).each { |row| tables << row[0] } tables end + alias nonview_tables base_tables def views(name = nil) #:nodoc: views = [] lib/rails_sql_views/connection_adapters/oracle_adapter.rb @@ -20,7 +20,7 @@ module RailsSqlViews query(q, name).map { |row| row[0] } end - def nonview_tables(name = nil) + def base_tables(name = nil) q = <<-SQL SELECT table_name, table_type FROM information_schema.tables @@ -30,6 +30,7 @@ module RailsSqlViews query(q, name).map { |row| row[0] } end + alias nonview_tables base_tables def views(name = nil) #:nodoc: q = <<-SQL lib/rails_sql_views/connection_adapters/postgresql_adapter.rb @@ -17,7 +17,7 @@ module RailsSqlViews end end - def nonview_tables(name = nil) + def base_tables(name = nil) sql = <<-SQL SELECT name FROM sqlite_master @@ -28,6 +28,7 @@ module RailsSqlViews row[0] end end + alias nonview_tables base_tables def views(name = nil) sql = <<-SQL lib/rails_sql_views/connection_adapters/sqlite_adapter.rb @@ -7,10 +7,11 @@ module RailsSqlViews end # Get all of the non-view tables from the currently connected schema - def nonview_tables(name = nil) + def base_tables(name = nil) # this is untested select_values("SELECT table_name FROM information_schema.tables", name) end + alias nonview_tables base_tables # Returns all the view names from the currently connected schema. def views(name = nil) lib/rails_sql_views/connection_adapters/sqlserver_adapter.rb @@ -81,7 +81,7 @@ module RailsSqlViews end def tables_with_views_excluded(stream) - @connection.nonview_tables.sort.each do |tbl| + @connection.base_tables.sort.each do |tbl| next if [ActiveRecord::Migrator.schema_migrations_table_name, ignore_tables].flatten.any? do |ignored| case ignored when String then tbl == ignored lib/rails_sql_views/schema_dumper.rb @@ -25,7 +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) + base_tables(name = nil) views(name = nil) view_select_statement(view, name=nil) test/README @@ -12,9 +12,9 @@ class AdapterTest < Test::Unit::TestCase found.delete(ActiveRecord::Migrator.schema_migrations_table_name) assert_equal ["people", "people2", "places", "v_person"], found end - def test_nonview_tables + def test_base_tables create_view - found = ActiveRecord::Base.connection.nonview_tables.sort + found = ActiveRecord::Base.connection.base_tables.sort found.delete(ActiveRecord::Migrator.schema_migrations_table_name) assert_equal ["people", "people2", "places"], found end test/adapter_test.rb 1ca832c417a315bdde57eed668fe73ed569a7098 Michael Schuerig michael@schuerig.de http://github.com/aeden/rails_sql_views/commit/923e1d2668c3a0e9a3dcb6965b7a5c8f5950ec24 923e1d2668c3a0e9a3dcb6965b7a5c8f5950ec24 2009-04-07T02:24:42-07:00 2009-04-07T02:24:42-07:00 Renamed Adapter#nonview_tables to #base_tables with an alias to the older name. edbc90187d2351d7313cc5f2dbaf74cd32c25626 Michael Schuerig michael@schuerig.de