X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FAdmin.pm;h=b0d76b8ae054e2cbc266814e24aa8dc4a5dfd7a9;hb=fcf32d045;hp=59b00812474e3c60f163facb4c815be2d98f8b82;hpb=70c288086248e5a4008490df22a56632341f2473;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Admin.pm b/lib/DBIx/Class/Admin.pm index 59b0081..b0d76b8 100644 --- a/lib/DBIx/Class/Admin.pm +++ b/lib/DBIx/Class/Admin.pm @@ -133,7 +133,7 @@ has 'set' => ( =head2 attrs -a hash ref or json string to be used for passing additonal info to the ->search call +a hash ref or json string to be used for passing additional info to the ->search call =cut @@ -167,7 +167,7 @@ sub _build_connect_info { config_file provide a config_file to read connect_info from, if this is provided config_stanze should also be provided to locate where the connect_info is in the config -The config file should be in a format readable by Config::General +The config file should be in a format readable by Config::Any. =cut @@ -180,7 +180,7 @@ has config_file => ( =head2 config_stanza -config_stanza for use with config_file should be a '::' deliminated 'path' to the connection information +config_stanza for use with config_file should be a '::' delimited 'path' to the connection information designed for use with catalyst config files =cut @@ -256,7 +256,7 @@ has version => ( =head2 preversion -Previouse version of the schema to create an upgrade diff for, the full sql for that version of the sql must be in the sql_dir +Previous version of the schema to create an upgrade diff for, the full sql for that version of the sql must be in the sql_dir =cut @@ -579,6 +579,7 @@ sub _find_stanza { die ("Could not find $stanza in config, $path does not seem to exist.\n"); } } + $cfg = $cfg->{connect_info} if exists $cfg->{connect_info}; return $cfg; }