From: Rafael Kitover <rkitover@cpan.org>
Date: Mon, 28 Sep 2009 08:49:27 +0000 (+0000)
Subject: Merge 'trunk' into 'sybase_support'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=763026c15bf2047020c261f430bd782bb5180850;p=dbsrgits%2FDBIx-Class-Historic.git

Merge 'trunk' into 'sybase_support'

r20734@hlagh (orig r7709):  ribasushi | 2009-09-20 20:49:11 -0400
Oops
r20735@hlagh (orig r7710):  ribasushi | 2009-09-21 05:02:14 -0400
Changes
r20736@hlagh (orig r7711):  ribasushi | 2009-09-21 06:49:30 -0400
Undocument the from attribute (the description was mostly outdated anyway)
r20737@hlagh (orig r7712):  ribasushi | 2009-09-21 06:58:58 -0400
Release 0.08112
r20740@hlagh (orig r7715):  ribasushi | 2009-09-21 10:26:07 -0400
A test for an obscure join syntax - make sure we don't break it
r20746@hlagh (orig r7721):  ribasushi | 2009-09-22 06:58:09 -0400
this would break in the future - sanitize sql fed to the tester
r20749@hlagh (orig r7724):  ribasushi | 2009-09-22 07:07:31 -0400
The hack is no longer necessary with a recent sqla
r20754@hlagh (orig r7729):  caelum | 2009-09-24 17:44:01 -0400
add test for multiple active statements in mssql over dbd::sybase
r20755@hlagh (orig r7730):  caelum | 2009-09-25 02:46:22 -0400
test on_connect_do with a coderef connect_info too
r20785@hlagh (orig r7731):  caelum | 2009-09-25 17:26:52 -0400
failing test for simple transaction with mssql via dbd::sybase
---

763026c15bf2047020c261f430bd782bb5180850
diff --cc Changes
index 53e4cf3,672f272..8060991
--- a/Changes
+++ b/Changes
@@@ -1,16 -1,6 +1,18 @@@
  Revision history for DBIx::Class
  
 +        - Complete Sybase RDBMS support including:
 +          - Support for TEXT/IMAGE columns
 +          - Support for the 'money' datatype
-           - Transaction savepoints support
-           - DateTime inflation support
-           - Support for bind variables when connecting to a newer Sybase with
-             OpenClient libraries
-           - Support for connections via FreeTDS with CASTs for bind variables
-             when needed
-           - Support for interpolated variables with proper quoting when
-             connecting to an older Sybase and/or via FreeTDS
++        - Transaction savepoints support
++        - DateTime inflation support
++        - Support for bind variables when connecting to a newer Sybase with
++           OpenClient libraries
++        - Support for connections via FreeTDS with CASTs for bind variables
++           when needed
++        - Support for interpolated variables with proper quoting when
++           connecting to an older Sybase and/or via FreeTDS
++
+ 0.08112 2009-09-21 10:57:00 (UTC)
          - Remove the recommends from Makefile.PL, DBIx::Class is not
            supposed to have optional dependencies. ever.
          - Mangle the DBIx/Class.pm POD to be more clear about
diff --cc Makefile.PL
index 8c1e88b,e3885d2..b76b7c9
--- a/Makefile.PL
+++ b/Makefile.PL
@@@ -114,15 -114,9 +114,15 @@@ my %force_requires_if_author = 
        'DateTime::Format::Oracle' => '0',
      ) : ()
    ,
 +
 +  $ENV{DBICTEST_SYBASE_DSN}
 +    ? (
 +      'DateTime::Format::Sybase' => 0,
 +    ) : ()
 +  ,
  );
  #************************************************************************#
- # Make *ABSOLUTELY SURE* that nothing on the list aboveis a real require,#
+ # Make ABSOLUTELY SURE that nothing on the list above is a real require, #
  # since every module listed in %force_requires_if_author is deleted      #
  # from the final META.yml (thus will never make it as a CPAN dependency) #
  #************************************************************************#