From: Rafael Kitover <rkitover@cpan.org>
Date: Sun, 1 Nov 2009 09:19:27 +0000 (+0000)
Subject: Merge 'current' into 'back-compat'
X-Git-Tag: 0.04999_13~23^2~21
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9c465d2cf2386ee8672bf4baa49b302986919f86;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

Merge 'current' into 'back-compat'

r18689@hlagh (orig r7408):  caelum | 2009-08-28 20:55:06 -0400
 r6812@hlagh (orig r6811):  caelum | 2009-06-28 00:08:58 -0400
 new branch
 r6814@hlagh (orig r6813):  caelum | 2009-06-28 02:52:09 -0400
 result class is generated for table with dot in name, but doesn't work yet
 r6864@hlagh (orig r6863):  caelum | 2009-06-29 20:18:30 -0400
 automatically set quote_char and name_sep for mssql
 r6865@hlagh (orig r6864):  caelum | 2009-06-29 20:39:46 -0400
 quote table names that include name_sep
 r6879@hlagh (orig r6878):  caelum | 2009-06-30 09:48:39 -0400
 add constraint to dot in table name test
 r6880@hlagh (orig r6879):  caelum | 2009-06-30 09:49:44 -0400
 rename test
 r6881@hlagh (orig r6880):  caelum | 2009-06-30 10:03:30 -0400
 add a test for mssql through dbd::sybase (which fails) and make mssql_dot_in_table_name test work for either sybase or odbc
 r6902@hlagh (orig r6901):  caelum | 2009-07-01 00:03:12 -0400
 determine db_schema for mssql if not supplied
 r6911@hlagh (orig r6910):  caelum | 2009-07-01 07:30:38 -0400
 minor changes
 r6912@hlagh (orig r6911):  caelum | 2009-07-01 09:06:12 -0400
 make mssql test get futher with dbd::sybase
 r6923@hlagh (orig r6922):  caelum | 2009-07-01 12:35:11 -0400
 mssql now passes against DBD::Sybase
 r6929@hlagh (orig r6928):  caelum | 2009-07-02 00:39:37 -0400
 merging in sybase branch
 r6933@hlagh (orig r6932):  caelum | 2009-07-02 02:24:46 -0400
 making some progress on Sybase
 r6958@hlagh (orig r6957):  caelum | 2009-07-02 21:29:49 -0400
 rels are still fucked in sybase
 r6960@hlagh (orig r6959):  caelum | 2009-07-02 23:33:07 -0400
 fix pg
 r6961@hlagh (orig r6960):  caelum | 2009-07-03 00:34:33 -0400
 sybase rels sort of work now, more than half-way through common tests
 r6979@hlagh (orig r6978):  caelum | 2009-07-03 15:35:38 -0400
 almost passes sybase tests now
 r7002@hlagh (orig r7001):  caelum | 2009-07-07 07:58:19 -0400
 add comment about sybase DSN
 r7026@hlagh (orig r7025):  caelum | 2009-07-10 16:53:09 -0400
 make tests pass
 r7364@hlagh (orig r7363):  caelum | 2009-08-23 03:37:54 -0400
 put extra mssql tests in the proper format
 r7378@hlagh (orig r7377):  caelum | 2009-08-24 11:39:56 -0400
 finished cleaning up branch, all tests pass
 r18687@hlagh (orig r7406):  caelum | 2009-08-28 20:45:12 -0400
 add sybase and mssql as features to Makefile.PL
 r18688@hlagh (orig r7407):  caelum | 2009-08-28 20:53:37 -0400
 remove comment about sybase dsn (it's handled automatically now)

r18691@hlagh (orig r7410):  caelum | 2009-08-28 21:14:40 -0400
add note about sybase dbic branch
r18692@hlagh (orig r7411):  caelum | 2009-08-28 21:21:53 -0400
dev release
r18693@hlagh (orig r7412):  caelum | 2009-08-28 21:23:05 -0400
update M::I version in Makefile.PL
r18694@hlagh (orig r7413):  caelum | 2009-08-28 21:26:05 -0400
fix warning in MySQL tests
r20606@hlagh (orig r7618):  caelum | 2009-09-10 02:06:45 -0400
remove dbic option from sybase test that is no longer necessary
r20845@hlagh (orig r7763):  ash | 2009-10-05 09:17:40 -0400
Only redump the files when something has actually changed

r20846@hlagh (orig r7764):  ash | 2009-10-05 09:38:45 -0400
Place a warning at the top of the files too

r20849@hlagh (orig r7767):  caelum | 2009-10-07 21:56:53 -0400
new dev release
r20944@hlagh (orig r7782):  caelum | 2009-10-13 10:46:22 -0400
patch from Robert Bohne to make _table_uniq_info more correct for Oracle
r21079@hlagh (orig r7825):  caelum | 2009-10-31 07:19:24 -0400
fix data_type for identities in MSSQL RT#50523
r21080@hlagh (orig r7826):  caelum | 2009-10-31 08:32:31 -0400
new dev release
r21081@hlagh (orig r7827):  caelum | 2009-10-31 08:52:58 -0400
add resources to Makefile.PL
r21083@hlagh (orig r7829):  caelum | 2009-10-31 09:12:36 -0400
fix up alignment in Changes
r21087@hlagh (orig r7833):  caelum | 2009-11-01 01:51:33 -0400
run advanced tests on SQLite too
---

9c465d2cf2386ee8672bf4baa49b302986919f86
diff --cc lib/DBIx/Class/Schema/Loader/Base.pm
index 7514b59,f5afef2..a8ccc74
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@@ -269,7 -269,13 +269,15 @@@ sub new 
                                                       TMPDIR  => 1,
                                                       CLEANUP => 1,
                                                     );
+ 
+     $self->{dump_directory} ||= $self->{temp_directory};
+ 
+     $self->{relbuilder} = DBIx::Class::Schema::Loader::RelBuilder->new(
+         $self->schema, $self->inflect_plural, $self->inflect_singular
+     ) if !$self->{skip_relationships};
+ 
 +    $self->_check_back_compat;
++
      $self;
  }