@@ -1,3 +1,7 @@ +=== HEAD + +* Don't swallow DatabaseConnectionErrors when creating model subclasses (tommy.midttveit) + === 3.2.0 (2009-07-02) * In the STI plugin, don't overwrite the STI field if it is already set (jeremyevans) CHANGELOG @@ -290,9 +290,9 @@ module Sequel @dataset.model = self if @dataset.respond_to?(:model=) begin @db_schema = (inherited ? superclass.db_schema : get_db_schema) - rescue Sequel::DatabaseConnectionError => e - raise e - rescue => e + rescue Sequel::DatabaseConnectionError + raise + rescue nil end self @@ -396,15 +396,15 @@ module Sequel ds_opts = dataset.opts single_table = ds_opts[:from] && (ds_opts[:from].length == 1) \ && !ds_opts.include?(:join) && !ds_opts.include?(:sql) - get_columns = proc{ + get_columns = proc do begin columns - rescue Sequel::DatabaseConnectionError => e - raise e - rescue => e + rescue Sequel::DatabaseConnectionError + raise + rescue [] end - } + end if single_table && (schema_array = (db.schema(table_name, :reload=>reload) rescue nil)) schema_array.each{|k,v| schema_hash[k] = v} if ds_opts.include?(:select) lib/sequel/model/base.rb 036fc48d1f578016231b18e50eeb671afbbe4233 Jeremy Evans code@jeremyevans.net http://github.com/jeremyevans/sequel/commit/b5f36ce5f5b486218f32aca6e733ee383b5b5dfe b5f36ce5f5b486218f32aca6e733ee383b5b5dfe 2009-07-02T09:41:12-07:00 2009-07-02T09:41:12-07:00 Update CHANGELOG and minor changes for previous patch bf1e07222979dc9608c88a644334186dbdeb57da Jeremy Evans code@jeremyevans.net