[svn:dbd-oracle] r14897 - in dbd-oracle/trunk: . lib/DBD/Oracle

Author: mjevans
Date: Wed Jul  6 00:49:18 2011
New Revision: 14897

Modified:
   dbd-oracle/trunk/Changes
   dbd-oracle/trunk/lib/DBD/Oracle/GetInfo.pm

Log:
Support development versions (_N) in GetInfo
Add missing change to 1.29_1  rt 56824
Fix a typo in Changes file


Modified: dbd-oracle/trunk/Changes
==============================================================================
--- dbd-oracle/trunk/Changes	(original)
+++ dbd-oracle/trunk/Changes	Wed Jul  6 00:49:18 2011
@@ -1,19 +1,23 @@
 Revision history for DBD::Oracle
 
+Changes in DBD-Oracle 1.29_2
+ [BUG FIXES]
+ - support development release versions in GetInfo (Martin J. Evans)
+
 Changes in DBD-Oracle 1.29_1
  [ENHANCEMENTS]
  - added support for TAF callback (John Scoles)
- - now trap OCIServerAttach errors (patch by Marc Fielding, applied 
+ - now trap OCIServerAttach errors (patch by Marc Fielding, applied
     by Martin J. Evans) [rt68958]
  - added installation notes for MAC Snow Leopard (Martin J. Evans)
- - added '/etc' to the search paths for tnsnames.ora (Martin J. Evans, Jay Senseman) 
+ - added '/etc' to the search paths for tnsnames.ora (Martin J. Evans, Jay Senseman)
     [rt67942]
  - removed support for ProcC connections (John Scoles)
  - added ora_db_shutdown and ora_db_startup private functions (Steffen Goeldner)
  - added Test::Simple 0.90 to build_requires as we use note etc (Martin J.  Evans)
 
  [BUG FIXES]
- - fixed bug in bind_col which was broken in 1.27 and stopped anyone using 
+ - fixed bug in bind_col which was broken in 1.27 and stopped anyone using
     a string as a column number. E.g., '1' (Martin J. Evans, Alexander
     Foken)
  - removed obsolete oparse_lang (John Scoles)
@@ -21,11 +25,12 @@
  - added missing OCIServerRelease to oci.def (Martin J. Evans) [rt68172]
  - fixed up the POD based on DBD::Pg (John Scoles)
  - POD review rephrasing, fixing typos and spelling mistakes up to
-    "Placeholder Binding Attributes" (Martin J. Evans)    
+    "Placeholder Binding Attributes" (Martin J. Evans)
+ - rt 56824 - add META_MERGE mentioning DBI required version (Martin J. Evans)
 
 * Changes in DBD-Oracle 1.28 (svn rev 14765)
 
-  Changed 26exe_array.t so it is compatiable with older version of Test::More by John Scoles
+  Changed 26exe_array.t so it is compatible with older version of Test::More by John Scoles
   A fix from Charles Jardine for 58object.t to stop an error on some 64 bit systems
   A few quick changes from H. Merijn Brand to fix some compiler warings and a fix for Oracle 9 clients
   Added connection attribute 'ora_connect_with_default_signals' that will localize Perl's $SIG{INT} handler from Brian Phillips and T. Bunce

Modified: dbd-oracle/trunk/lib/DBD/Oracle/GetInfo.pm
==============================================================================
--- dbd-oracle/trunk/lib/DBD/Oracle/GetInfo.pm	(original)
+++ dbd-oracle/trunk/lib/DBD/Oracle/GetInfo.pm	Wed Jul  6 00:49:18 2011
@@ -5,8 +5,14 @@
 
 my $sql_driver = 'Oracle';
 my $sql_ver_fmt = '%02d.%02d.%04d';   # ODBC version string: ##.##.#####
+my ($a,$b,$c) = (0,0,0);
+my $ver = $DBD::Oracle::VERSION;
+my @parts = split /\./, $ver;
+$a = $parts[0];
+($b,$c) = split /_/, $parts[1];
+$c = 0 if !$c;
 
-my $sql_driver_ver = sprintf $sql_ver_fmt, split (/\./, "$DBD::Oracle::VERSION.0.0.0.0.0.0");
+my $sql_driver_ver = sprintf $sql_ver_fmt, $a, $b, $c;
 
 sub sql_dbms_version {
     my $dbh = shift;