Re: Patches for DBI v1.32 - dbd_xsh.h, Driver.xst, lib/DBI/DBD.pm

[Steffen Goeldner]

Jonathan Leffler wrote:
> 
[...]
>
> The only controversial bit is, I think, the changes made in the
> section on Generating a GetInfo Package -- maybe Steffen should take a
> look?

Done. Since double quotes are required for your $driver variable,
there is a potential 'double quote trap'.
I attached a few changes.


Steffen
*** DBD.pm      Mon Dec 16 23:09:57 2002
--- DBD.pm-new  Mon Dec 16 23:04:19 2002
***************
*** 2572,2585 ****
      $dbh->{ PrintError } = 1;
        $driver = "<foo>" unless defined $driver;
  
!     print <<PERL;
! package DBD::$driver::GetInfo;
  
! use DBD::$driver();
  
! my \$sql_driver = $driver;
  my \$sql_ver_fmt = '%02d.%02d.%04d';   # ODBC version string: ##.##.#####
! my \$sql_driver_ver = sprintf \$sql_ver_fmt, split (/\./, \$DBD::$driver::VERSION);
  
  my \@Keywords = qw(
  PERL
--- 2572,2585 ----
      $dbh->{ PrintError } = 1;
        $driver = "<foo>" unless defined $driver;
  
!     print <<"PERL";
! package DBD::${driver}::GetInfo;
  
! use DBD::${driver}();
  
! my \$sql_driver = '$driver';
  my \$sql_ver_fmt = '%02d.%02d.%04d';   # ODBC version string: ##.##.#####
! my \$sql_driver_ver = sprintf \$sql_ver_fmt, split (/\./, \$DBD::${driver}::VERSION);
  
  my \@Keywords = qw(
  PERL
***************
*** 2595,2601 ****
  
  sub sql_data_source_name {
      my $dbh = shift;
!     return 'dbi:$sql_driver:' . $dbh->{Name};
  }
  sub sql_keywords {
      return join ',', @Keywords;
--- 2595,2601 ----
  
  sub sql_data_source_name {
      my $dbh = shift;
!     return "dbi:$sql_driver:" . $dbh->{Name};
  }
  sub sql_keywords {
      return join ',', @Keywords;