X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI.pm;h=b3959324139c0d12e7e5d14fd2941e0e98793b7c;hb=0eb27426ceda801e6e872dc09eba34833fc0aaf0;hp=e6586c240171c45ec16db42b346dc09275ce0608;hpb=92fe218153fcfdb968bfa929ed7f31389738335f;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm index e6586c2..b395932 100644 --- a/lib/DBIx/Class/Storage/DBI.pm +++ b/lib/DBIx/Class/Storage/DBI.pm @@ -86,7 +86,12 @@ sub _find_syntax { sub select { my ($self, $table, $fields, $where, $order, @rest) = @_; - $table = $self->_quote($table) unless ref($table); + if (ref $table eq 'SCALAR') { + $table = $$table; + } + elsif (not ref $table) { + $table = $self->_quote($table); + } local $self->{rownum_hack_count} = 1 if (defined $rest[0] && $self->{limit_dialect} eq 'RowNum'); @rest = (-1) unless defined $rest[0]; @@ -322,6 +327,15 @@ DBIx::Class::Storage::DBI - DBI storage handler =head1 SYNOPSIS + my $schema = MySchema->connect('dbi:SQLite:my.db'); + + $schema->storage->debug(1); + $schema->dbh_do("DROP TABLE authors"); + + $schema->resultset('Book')->search({ + written_on => $schema->storage->datetime_parser(DateTime->now) + }); + =head1 DESCRIPTION This class represents the connection to an RDBMS via L. See @@ -355,34 +369,37 @@ The argument list may contain: =item * -The same 4-element argument set one would normally pass to L, -optionally followed by L +The same 4-element argument set one would normally pass to +L, optionally followed by +L recognized by DBIx::Class: - $connect_info_args = [ $dsn, $user, $pass, \%dbi_attributes, \%extra_attributes ]; + $connect_info_args = [ $dsn, $user, $password, \%dbi_attributes?, \%extra_attributes? ]; =item * -A lone code reference which returns a connected L -optinally followed by L -recognized by DBIx::Class: +A single code reference which returns a connected +L optionally followed by +L recognized +by DBIx::Class: - $connect_info_args = [ sub { DBI->connect (...) }, \%extra_attributes ]; + $connect_info_args = [ sub { DBI->connect (...) }, \%extra_attributes? ]; =item * -A lone hashref with all the attributes and the dsn/user/pass mixed together: +A single hashref with all the attributes and the dsn/user/password +mixed together: $connect_info_args = [{ dsn => $dsn, user => $user, - pass => $pass, + password => $pass, %dbi_attributes, %extra_attributes, }]; This is particularly useful for L based applications, allowing the -following config: +following config (L style): schema_class App::DB @@ -396,13 +413,12 @@ following config: =back -Please note that the L docs -recommend that you always explicitly set C to either -C<0> or C<1>. L further recommends that it be set -to C<1>, and that you perform transactions via our L -method. L will set it to C<1> if you do not do explicitly -set it to zero. This is the default for most DBDs. See -L for details. +Please note that the L docs recommend that you always explicitly +set C to either I<0> or I<1>. L further +recommends that it be set to I<1>, and that you perform transactions +via our L method. L will set it +to I<1> if you do not do explicitly set it to zero. This is the default +for most DBDs. See L for details. =head3 DBIx::Class specific connection attributes @@ -417,7 +433,7 @@ these options will be cleared before setting the new ones, regardless of whether any options are specified in the new C. -=over 4 +=over =item on_connect_do @@ -440,10 +456,10 @@ array reference, its return value is ignored. =item on_disconnect_do -Takes arguments in the same form as L and executes them +Takes arguments in the same form as L and executes them immediately before disconnecting from the database. -Note, this only runs if you explicitly call L on the +Note, this only runs if you explicitly call L on the storage object. =item disable_sth_caching @@ -455,26 +471,31 @@ statement handles via L. Sets the limit dialect. This is useful for JDBC-bridge among others where the remote SQL-dialect cannot be determined by the name of the -driver alone. +driver alone. See also L. =item quote_char Specifies what characters to use to quote table and column names. If -you use this you will want to specify L as well. +you use this you will want to specify L as well. -quote_char expects either a single character, in which case is it is placed -on either side of the table/column, or an arrayref of length 2 in which case the -table/column name is placed between the elements. +C expects either a single character, in which case is it +is placed on either side of the table/column name, or an arrayref of length +2 in which case the table/column name is placed between the elements. -For example under MySQL you'd use C '`'>, and user SQL Server you'd -use C [qw/[ ]/]>. +For example under MySQL you should use C<< quote_char => '`' >>, and for +SQL Server you should use C<< quote_char => [qw/[ ]/] >>. =item name_sep -This only needs to be used in conjunction with L, and is used to +This only needs to be used in conjunction with C, and is used to specify the charecter that seperates elements (schemas, tables, columns) from each other. In most cases this is simply a C<.>. +The consequences of not supplying this value is that L +will assume DBIx::Class' uses of aliases to be complete column +names. The output will look like I<"me.name"> when it should actually +be I<"me"."name">. + =item unsafe This Storage driver normally installs its own C, sets @@ -497,9 +518,15 @@ If this option is true, L will use savepoints when nesting transactions, making it possible to recover from failure in the inner transaction without having to abort all outer transactions. +=item cursor_class + +Use this argument to supply a cursor class other than the default +L. + =back -Some real-life examples of arguments to L and L +Some real-life examples of arguments to L and +L # Simple SQLite connection ->connect_info([ 'dbi:SQLite:./foo.db' ]); @@ -529,7 +556,7 @@ Some real-life examples of arguments to L and L for explanation + # See parse_connect_info for explanation ->connect_info( [{ dsn => 'dbi:Pg:dbname=foo', @@ -581,7 +608,7 @@ sub connect_info { unshift @args, delete $attrs{$_}; } } - else { # otherwise assume dsn/user/pass + \%attrs + \%extra_attrs + else { # otherwise assume dsn/user/password + \%attrs + \%extra_attrs %attrs = ( % { $args[3] || {} }, % { $args[4] || {} }, @@ -615,7 +642,7 @@ sub connect_info { =head2 on_connect_do -This method is deprecated in favor of setting via L. +This method is deprecated in favour of setting via L. =head2 dbh_do @@ -1384,7 +1411,8 @@ sub select_single { my $self = shift; my ($rv, $sth, @bind) = $self->_select(@_); my @row = $sth->fetchrow_array; - if(@row && $sth->fetchrow_array) { + my @nextrow = $sth->fetchrow_array if @row; + if(@row && @nextrow) { carp "Query returned more than one row. SQL that returns multiple rows is DEPRECATED for ->find and ->single"; } # Need to call finish() to work round broken DBDs @@ -1513,9 +1541,9 @@ sub sqlt_type { shift->dbh->{Driver}->{Name} } =head2 bind_attribute_by_data_type -Given a datatype from column info, returns a database specific bind attribute for -$dbh->bind_param($val,$attribute) or nothing if we will let the database planner -just handle it. +Given a datatype from column info, returns a database specific bind +attribute for C<< $dbh->bind_param($val,$attribute) >> or nothing if we will +let the database planner just handle it. Generally only needed for special case column types, like bytea in postgres. @@ -1556,7 +1584,10 @@ sub create_ddl_dir { } $databases ||= ['MySQL', 'SQLite', 'PostgreSQL']; $databases = [ $databases ] if(ref($databases) ne 'ARRAY'); - $version ||= $schema->VERSION || '1.x'; + + my $schema_version = $schema->schema_version || '1.x'; + $version ||= $schema_version; + $sqltargs = { add_drop_table => 1, ignore_constraint_names => 1, @@ -1581,7 +1612,7 @@ sub create_ddl_dir { my $file; my $filename = $schema->ddl_filename($db, $version, $dir); - if (-e $filename && (!$version || ($version == $schema->schema_version()))) { + if (-e $filename && ($version eq $schema_version )) { # if we are dumping the current version, overwrite the DDL warn "Overwriting existing DDL file - $filename"; unlink($filename); @@ -1698,7 +1729,7 @@ sub deployment_statements { # Need to be connected to get the correct sqlt_type $self->ensure_connected() unless $type; $type ||= $self->sqlt_type; - $version ||= $schema->VERSION || '1.x'; + $version ||= $schema->schema_version || '1.x'; $dir ||= './'; my $filename = $schema->ddl_filename($type, $dir, $version); if(-f $filename) @@ -1877,17 +1908,14 @@ The following methods are extended:- =item limit_dialect See L for details. -For setting, this method is deprecated in favor of L. =item quote_char See L for details. -For setting, this method is deprecated in favor of L. =item name_sep See L for details. -For setting, this method is deprecated in favor of L. =back