@@ -6,7 +6,9 @@ class SchemaBrowser attr_reader :tables, :relations def initialize - @tables = SchemaBrowser.get_tables_from_connection.map { |table_name| SchemaTable.new(table_name) } + @tables = SchemaBrowser.get_tables_from_connection.map do |table_name| + SchemaTable.new(table_name) + end @tables.each do |table| table.gather_relations end lib/schema_browser.rb @@ -7,9 +7,9 @@ class SchemaTable def initialize(table_name) @table_id = get_id @name = table_name - @columns = ActiveRecord::Base.connection.columns(table_name).map { |c| SchemaColumn.new(c) } @relations = [] @@tables[table_name] = self + @columns = ActiveRecord::Base.connection.columns(table_name).map { |c| SchemaColumn.new(c) } set_indexes set_primary_key end @@ -55,7 +55,9 @@ class SchemaTable @indexes.each do |index| column_name = get_column_name_from_index_name(index.name) if column_name - column(column_name).index = true + if column(column_name) + column(column_name).index = true + end end end end lib/schema_table.rb @@ -26,7 +26,7 @@ describe SchemaTable do add_relation("parrot", "pirate") add_mock_index("pirates", "name") - + add_mock_index("parrots", "non_existing_column") # FIXME: this should be done just in the test that checks for error on non existing column end before(:each) do @@ -162,6 +162,12 @@ describe SchemaTable do end end + it "should not generate an error if the column inferred from an index does not exist" do + lambda { + SchemaTable.new("parrots") + }.should_not raise_error + end + def stub_table(table_name, instantiate = true) @relations[table_name] ||= [] return unless instantiate spec/lib/schema_table_spec.rb c8a2e441f0b2f4879769dbd31b20b95470f2cc8e Tom ten Thij git@tomtenthij.nl http://github.com/tomtt/schema-browser/commit/804ac0d7ba39a6e24182a99a4c5c83ee9c1dc163 804ac0d7ba39a6e24182a99a4c5c83ee9c1dc163 2008-02-18T06:20:54-08:00 2008-02-18T06:20:54-08:00 fixed error when column inferred from index does not exist 5a72cde2b409458b3cd4cc043752840d9076fd86 Tom ten Thij git@tomtenthij.nl