From 9107011937ebc2a3e5ac0219b835b5f2f04e2ac2 Mon Sep 17 00:00:00 2001 From: Patrick Simon Date: Thu, 30 Apr 2015 12:27:11 +0200 Subject: [PATCH 01/11] added a test that fails for unicode mysql * you have to set the mysql dsn, user and pass in $ENV --- t/19-populate-unicode.t | 4 ++ t/lib/.DBICTest.pm.un~ | Bin 15453 -> 0 bytes t/var/DBIxClassDifferent.db | Bin 4096 -> 0 bytes t/var/fixtures/_config_set | 17 ------ t/var/fixtures/excludes/_config_set | 33 ------------ t/var/fixtures/multi/date.json/_config_set | 20 -------- t/var/fixtures/multi/rules.json/_config_set | 54 -------------------- 7 files changed, 4 insertions(+), 124 deletions(-) delete mode 100755 t/lib/.DBICTest.pm.un~ delete mode 100644 t/var/DBIxClassDifferent.db delete mode 100644 t/var/fixtures/_config_set delete mode 100644 t/var/fixtures/excludes/_config_set delete mode 100644 t/var/fixtures/multi/date.json/_config_set delete mode 100644 t/var/fixtures/multi/rules.json/_config_set diff --git a/t/19-populate-unicode.t b/t/19-populate-unicode.t index ab5fce1..1f6bb9c 100644 --- a/t/19-populate-unicode.t +++ b/t/19-populate-unicode.t @@ -51,3 +51,7 @@ $fixtures->populate( my $cd = $schema->resultset('CD')->find( { cdid => 5 }); is($cd->title, "Unicode Chars ™ © • † ∑ α β « » → …", "Unicode chars found"); + +my $umlaute_cd = $schema->resultset('CD')->find( { cdid => 6 } ); + +is($umlaute_cd->title, "Übertreibung älterer Umlaute", "German special chars are correctly imported"); diff --git a/t/lib/.DBICTest.pm.un~ b/t/lib/.DBICTest.pm.un~ deleted file mode 100755 index 8c8e96b6c6492437bc533a7151e0b3d53a72bb11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15453 zcmeI(OHWfl6bJAN)ED?h5#=?lsGwCr)Ij1!m5K@fbPe%f#wF=w-;FKaRv zi<6 zNd;Gy@G7-d>Uatbe>hLQ5x@MVw(<&|(Dt7zkn67hQQ-)JZ_RY> zi@brWprRmtLjwI(0j-N4qTMl|iJtK55IMtEJw-wMhI9sON*bWYV>}n%E-oaR!qAAk z;j5;iAbvxaY20blAqv5?$l6e>qM{&vLlSLH8l`{zsS7{ZU>nVrb)qXP<0U4~wu)zJ z`7HW^{>v-s(M0#3zVPsj7YWzm2Q|!oF>wa%F6v5)B6w{yLAoc0>U!F~)e|azmvw)Y zWm!npiR7WIvZ5e7%&Ea&;^zGAkH2iqt`@tfC-(Ll^5wi#2(nm{p;;Nn{RTRTTyC8@g0aSgMJu z|BMR6%_4CCE2=1n-_V6BR+o4(oODHpO<}l2L?20H*`5hjI@oO*9z9%I>C%!YZ9q~R2fA< z{Dv;Zj>vI^aqSH-tO&JzB2$Q}q9};p(52XJDXzJTi4lQ@J7S^+P(_TY;r)>iA0+K0 zX|oXJooH+bv;87fc&ec&h~Lm<*lHPyn+cf^WCui=;8a3U5Wk^|u*D)=y&aSV&M!dO@;m%{v5SXlmL;_A#)*%b2ECd!id>zhCD CPt^th diff --git a/t/var/DBIxClassDifferent.db b/t/var/DBIxClassDifferent.db deleted file mode 100644 index 67aef5cdc87c8f974b7ec7c3afbdc41ce127029c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmeH|!AiqG5QcY?(BQ#C4^oPk@z#K1i!Wddp%l}oF&=tcvs+zBBW%}7kMS9NM!^^G z?50UeiqziQ9kRQVOyK|X!DR050xlVhU&Vw-xIh-d7+nG&gc@pDYAxeHCG~r}Ec|me z(Ak%Ls9rFQ9GRcSk2-YhJ%O2Nx7ux-_a&KDsVm82%Ep4TjF!9UMZO#R5W81_59KrH zK$UR{gE02{egwDCVCY68xb{a7-oy|-1i>jlMkWkqL?q8dbb8&cvno3Iv0=BGP5g1P zP)%q;tu?iT7D@@-u0n+5Qwcni?1_n$gwmH>rW*{X>YNd=!QBfk>6|ajl>+5%teLE& zmC-WWZuSonr|3;=ej|11&;&GrT_tdYP1N& [ - { - 'class' => 'CD', - 'quantity' => 'all' - } - ], - 'might_have' => { - 'fetch' => 0 - }, - 'has_many' => { - 'fetch' => 0 - }, - 'belongs_to' => { - 'fetch' => 1 - } - }; diff --git a/t/var/fixtures/excludes/_config_set b/t/var/fixtures/excludes/_config_set deleted file mode 100644 index 00370ca..0000000 --- a/t/var/fixtures/excludes/_config_set +++ /dev/null @@ -1,33 +0,0 @@ -$VAR1 = { - 'sets' => [ - { - 'quantity' => 'all', - 'class' => 'Producer' - }, - { - 'quantity' => 'all', - 'class' => 'CD' - }, - { - 'quantity' => 'all', - 'class' => 'Artist' - }, - { - 'quantity' => 'all', - 'class' => 'Track' - }, - { - 'quantity' => 'all', - 'class' => 'CD_to_Producer' - } - ], - 'belongs_to' => { - 'fetch' => 0 - }, - 'has_many' => { - 'fetch' => 0 - }, - 'might_have' => { - 'fetch' => 0 - } - }; diff --git a/t/var/fixtures/multi/date.json/_config_set b/t/var/fixtures/multi/date.json/_config_set deleted file mode 100644 index 005a557..0000000 --- a/t/var/fixtures/multi/date.json/_config_set +++ /dev/null @@ -1,20 +0,0 @@ -$VAR1 = { - 'sets' => [ - { - 'class' => 'Track', - 'ids' => [ - '9' - ] - } - ], - 'belongs_to' => { - 'fetch' => 1 - }, - 'has_many' => { - 'fetch' => 0 - }, - 'might_have' => { - 'fetch' => 0 - }, - 'datetime_relative' => '2007-10-30 00:00:00' - }; diff --git a/t/var/fixtures/multi/rules.json/_config_set b/t/var/fixtures/multi/rules.json/_config_set deleted file mode 100644 index 2cc6621..0000000 --- a/t/var/fixtures/multi/rules.json/_config_set +++ /dev/null @@ -1,54 +0,0 @@ -$VAR1 = { - 'might_have' => { - 'fetch' => 0 - }, - 'rules' => { - 'might_have' => { - 'fetch' => 0 - }, - 'CD' => { - 'join' => [ - 'tags' - ], - 'fetch' => [ - { - 'cond' => { - 'position' => 2 - }, - 'rel' => 'tracks' - } - ], - 'cond' => [ - { - 'tags.tag' => 'Cheesy' - } - ] - } - }, - 'sets' => [ - { - 'ids' => [ - '5' - ], - 'class' => 'CD' - }, - { - 'ids' => [ - '1' - ], - 'fetch' => [ - { - 'rel' => 'cds', - 'quantity' => 'all' - } - ], - 'class' => 'Artist' - } - ], - 'belongs_to' => { - 'fetch' => 1 - }, - 'has_many' => { - 'fetch' => 0 - } - }; From 263544e83445cb9bdac2ebf94030ade746f7415c Mon Sep 17 00:00:00 2001 From: Patrick Simon Date: Thu, 30 Apr 2015 12:39:21 +0200 Subject: [PATCH 02/11] fixed the test to work with mysql per $ENV --- ..gitignore.un~ | Bin 0 -> 529 bytes .cpanfile.un~ | Bin 0 -> 5052 bytes lib/DBIx/Class/Fixtures/External/.File.pm.un~ | Bin 0 -> 547 bytes t/.19-populate-unicode.t.un~ | Bin 0 -> 99674 bytes t/19-populate-unicode.t | 16 +++++- t/lib/.DBICTest.pm.un~ | Bin 0 -> 26894 bytes t/lib/DBICTest.pm | 5 +- t/var/DBIxClassDifferent.db | Bin 0 -> 4096 bytes t/var/fixtures/CD/5.fix | 2 +- t/var/fixtures/CD/6.fix | 2 +- t/var/fixtures/_config_set | 17 ++++++ t/var/fixtures/excludes/CD/5.fix | 2 +- t/var/fixtures/excludes/CD/6.fix | 2 +- t/var/fixtures/excludes/_config_set | 33 +++++++++++ t/var/fixtures/multi/date.json/_config_set | 20 +++++++ t/var/fixtures/multi/rules.json/CD/5.fix | 2 +- t/var/fixtures/multi/rules.json/_config_set | 54 ++++++++++++++++++ 17 files changed, 148 insertions(+), 7 deletions(-) create mode 100644 ..gitignore.un~ create mode 100644 .cpanfile.un~ create mode 100644 lib/DBIx/Class/Fixtures/External/.File.pm.un~ create mode 100644 t/.19-populate-unicode.t.un~ create mode 100755 t/lib/.DBICTest.pm.un~ create mode 100644 t/var/DBIxClassDifferent.db create mode 100644 t/var/fixtures/_config_set create mode 100644 t/var/fixtures/excludes/_config_set create mode 100644 t/var/fixtures/multi/date.json/_config_set create mode 100644 t/var/fixtures/multi/rules.json/_config_set diff --git a/..gitignore.un~ b/..gitignore.un~ new file mode 100644 index 0000000000000000000000000000000000000000..11b49ca38cabc8a3f3fd005299b2769117a4941f GIT binary patch literal 529 zcmWH`%$*;a=aT=FfhmRc%Odg8+8>hhuLZyVdeiqRf5f{b@rlQF-LaXO)cEum0|Nsa z5W@h7%?QOHF&G;}GlWVnNMeDA#9sgjpaGB+3lM`1{0{_R?P!Wdxzq{)V00uxqvNXt X&`@S1gF#WjmXn{Hn4@pn_ZBv~9s58VGFVV7bKI zV=InE*wQtQQdq%8JmL^0z+~)$LQI7hCNyLqm$=#y9E`ojX#OtcGeBW~@usF{Dx4?R z9pC3XyRzmM9M01vC-0W+sflf&8Nhzc0a?&P)Mz3JT7xwAR85ig@Do8Jij`^=#Ttr1 zs8uY~J-ZIWJWGjrF|LgI1ezevpKo5H)&AX0$vd zy~AdDv0wCLy986aa%P|eUkCOXK4d{>5Z{sDYY8rXjqP$kUi_$Eeycv|2QOh2o+T{d zhbyV^LlU$G`Mv*He!<%GM?P?MDrX4FUK(b#q9jG%(_G@(Qu$ChGU}_9@YW(+tw2a! zqCyX1qxd`1Fp&kFL1GahW(5tiQEXH;%((sSZXx5XmYq$nROCEU&CaE>PBFh+s>oFg z6xH4fVW^JbyBJkuL1)k{`AxGr9Q&uLygGtW{SN^#eljraRi|csZeqPxSy53kerd02 p5#p`TgV+FGm_kGrbOwn%2(d`eUK_>g>(RI^+9>@DQ*WftXP>t2=coVx literal 0 HcmV?d00001 diff --git a/lib/DBIx/Class/Fixtures/External/.File.pm.un~ b/lib/DBIx/Class/Fixtures/External/.File.pm.un~ new file mode 100644 index 0000000000000000000000000000000000000000..3e2e7132b1c49fac0e9d4554ca5ba53ef2a4333d GIT binary patch literal 547 zcmWH`%$*;a=aT=FfvMF$DR;(M_G!1xPqQso3Me$yKcA9$X2zHQ2W(cfYMxbKU|`4v zVi=GBG8my4BnD%HXogVr`w1)%k@yQB0W<)TVh3W7Aq@Y40IVIv83i;50bq2*L!;v> sD9G7>msa942i6t2d>bcnkKw90}wDI{W0L9)ZEC2ui literal 0 HcmV?d00001 diff --git a/t/.19-populate-unicode.t.un~ b/t/.19-populate-unicode.t.un~ new file mode 100644 index 0000000000000000000000000000000000000000..659a5ef17b6cd39c198afd3e2ee73ad29b8fff35 GIT binary patch literal 99674 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, 'got schema' ); + +plan skip_all => 'Set $ENV{FIXTURETEST_DSN}, _USER and _PASS to point at MySQL DB to run this test' + unless ($ENV{FIXTURETEST_DSN}); + +ok( my $schema = DBICTest->init_schema( { dsn => $ENV{FIXTURETEST_DSN}, user => $ENV{FIXTURETEST_USER}, pass => $ENV{FIXTURETEST_PASS} } ) ); + + + +#ok( my $schema = DBICTest->init_schema(), 'got schema' ); + my $config_dir = io->catfile(qw't var configs')->name; # do dump @@ -24,6 +34,10 @@ ok( 'object created with correct config dir' ); +# DBI::mysql:database=test;host=localhost;port=5624 + + + DBICTest->clear_schema($schema); DBICTest->populate_schema($schema); diff --git a/t/lib/.DBICTest.pm.un~ b/t/lib/.DBICTest.pm.un~ new file mode 100755 index 0000000000000000000000000000000000000000..4d1a74375c2de756eb5e025cc1fad17547a601c3 GIT binary patch literal 26894 zcmeI*-)|IE6bJAv6sVx$4@49Sm(oHD+m=#58U$OwANX5wsY*!GAJcRbx?8(j6Qe$u z_$Z41fS8~!zMA-8cD+MH!$5b>J)b+f zv%52w^X1vArOKJ=jl!C@yRLlq`Pp~YT{iE3^JmMJPlGRR41L+w-u=r@KaRX{eClGM zQ25^VxNWwFWZ*?1{<`k zas^5~8-EQs3WcR@_P#%`{X^TowH+h}Ow=xzfg*l&oSUmwE7J>?Om*5!1VOFCZXOyM zG8cw_*lv5=psS*BHN4+i(ciK}_ost5bfhwZjgw#T$DgLd{cGdx+XRD#L+Sh+G?H787W=TxmyG@Vlu z3$mJG$^FZyX zAfixg|AN@Q`2jzu_tWq&4V0b=A_~Ry=fw0)-|9j70F4f_K;@|*qEIaVyjZ^3dwf8L zA2&n;#3WF7kv9Es9{9ej4|$#w!#DYC2hP2eDdvE>Q$a+b*!@|td-_LuV2(d�W73 zlpU2=jV5M)M$Df2K`xa0X@Hmks!jzFg<|!m#p-FF-UIm{4Ga@N(WxM!P>lYR7(L}1 z8yFAJxZtnmR1i@pHh)rVp8S#y#D{2D;8$`gh$s}3KOrVhd@T#%K^hhGRh$YU3dQ1& zi^c!>Jv@L9)1ZK_;8YM%CKCA8#u{J-G12?{24C4a4 zVxtnP(Q;t_9E8{#(y<>FW7DfP@6;F_+#j+X*A43FvM7S2<*;6ATu;>2us&%Y?X>Oj z>9U(6>(1KbOfWkhpW}+0*5EhWaEV`w?aPm)=dYtIKAXJ?>@t7FbbOOSwZ?WvL*3LznEKhAYYDy)FTet&}{F6_yI(H*~=cBw%x1Zvw}4lsk;o zl?viFw65=FJry5JxaPZz2#o6~br35n6~u4oV(m|`=DIixiW?|%2&*a;#Bbb@`+gc~Vs@G2=4 z#Bb;#rBxB4-PC!hH3TYcPb!Gt(B;{kcoofF+5&vHQ_7%KPAZ7s(8akg!I`;G3G~8mS)!~VtD1fZ z>E2zMdy|?OtIh!L4!U>1Dkc@gZ|K78N?>MK!Y*Fp25G}pEm4X8rMWCS6PC>vg96=M zlr>nDk_zHCbW!d}P&QrG3v%Hy#8JjjRY|{mbnh<7j)Y{h_1OToh3*-s3P}a=8@eEO zCm@@wvj?|(C|8)OBNfDN=yHr1S584mUoH`BTPanLDkBxdZ|Gv&6+14UNtC+iCDiVv zOd+a@R1m+ROL1pHF>U2ipkdknxB*lV<7#-nwTSO!ok`N3KulSE7H0QRs_;}pDv00E zWw;|@m|Q>@WcO2=;8a2?h~LmfxIIDG_)kx0325E{kt{S-&@UU^yA`|=K9RPhukQU| lLU6P^Zx*jl1oQRzpga*&8h@A>Uzn>KyCTd?or!<= 1, sqlite_unicode => 1 }); + use DDP; + p $dsn; + + my @connect_info = ($dsn, $dbuser, $dbpass, { AutoCommit => 1, mysql_enable_utf8 => 1 }); if ($args{compose_connection}) { $schema = DBICTest::Schema->compose_connection( diff --git a/t/var/DBIxClassDifferent.db b/t/var/DBIxClassDifferent.db new file mode 100644 index 0000000000000000000000000000000000000000..e121d0bcf005fb2f397005a3828b81b8b8cf735c GIT binary patch literal 4096 zcmeH|K}*9h6vvaMta$LSgN)(jd0Rno!!KYhWemHjwH|hiZKjp3LKY`G*3aN)6#N37 zP1kO$l(~D&qe))#0{?%0@Y?%3Hx>-0uY5)YTp%4`j4lBXLM=ITIo5F?lkIoBF8r~! z(Ak%9C=U=VL*!HYk&B9dPhdfePPdD*p`i0JwFG@k*p$aCjfz>fea8wM2&^mDfnpDO zP-bxiBQJ14y@BhkQy{Y$C_fiBD Wff|9W{wK1i)efi)ML-c~EP-F~)`fQf literal 0 HcmV?d00001 diff --git a/t/var/fixtures/CD/5.fix b/t/var/fixtures/CD/5.fix index 0912382..344820e 100644 --- a/t/var/fixtures/CD/5.fix +++ b/t/var/fixtures/CD/5.fix @@ -1,6 +1,6 @@ $HASH1 = { artist => 2, cdid => 5, - title => "Unicode Chars \x{2122} \251 \x{2022} \x{2020} \x{2211} \x{3b1} \x{3b2} \253 \273 \x{2192} \x{2026}", + title => "Unicode Chars \342\204\242 \302\251 \342\200\242 \342\200\240 \342\210\221 \316\261 \316\262 \302\253 \302\273 \342\206\222 \342\200\246", year => 2015 }; diff --git a/t/var/fixtures/CD/6.fix b/t/var/fixtures/CD/6.fix index 11a0d17..8519567 100644 --- a/t/var/fixtures/CD/6.fix +++ b/t/var/fixtures/CD/6.fix @@ -1,6 +1,6 @@ $HASH1 = { artist => 3, cdid => 6, - title => "\334bertreibung \344lterer Umlaute", + title => "\303\234bertreibung \303\244lterer Umlaute", year => 1998 }; diff --git a/t/var/fixtures/_config_set b/t/var/fixtures/_config_set new file mode 100644 index 0000000..1f2eb6e --- /dev/null +++ b/t/var/fixtures/_config_set @@ -0,0 +1,17 @@ +$VAR1 = { + 'has_many' => { + 'fetch' => 0 + }, + 'belongs_to' => { + 'fetch' => 1 + }, + 'sets' => [ + { + 'quantity' => 'all', + 'class' => 'CD' + } + ], + 'might_have' => { + 'fetch' => 0 + } + }; diff --git a/t/var/fixtures/excludes/CD/5.fix b/t/var/fixtures/excludes/CD/5.fix index 0912382..344820e 100644 --- a/t/var/fixtures/excludes/CD/5.fix +++ b/t/var/fixtures/excludes/CD/5.fix @@ -1,6 +1,6 @@ $HASH1 = { artist => 2, cdid => 5, - title => "Unicode Chars \x{2122} \251 \x{2022} \x{2020} \x{2211} \x{3b1} \x{3b2} \253 \273 \x{2192} \x{2026}", + title => "Unicode Chars \342\204\242 \302\251 \342\200\242 \342\200\240 \342\210\221 \316\261 \316\262 \302\253 \302\273 \342\206\222 \342\200\246", year => 2015 }; diff --git a/t/var/fixtures/excludes/CD/6.fix b/t/var/fixtures/excludes/CD/6.fix index 11a0d17..8519567 100644 --- a/t/var/fixtures/excludes/CD/6.fix +++ b/t/var/fixtures/excludes/CD/6.fix @@ -1,6 +1,6 @@ $HASH1 = { artist => 3, cdid => 6, - title => "\334bertreibung \344lterer Umlaute", + title => "\303\234bertreibung \303\244lterer Umlaute", year => 1998 }; diff --git a/t/var/fixtures/excludes/_config_set b/t/var/fixtures/excludes/_config_set new file mode 100644 index 0000000..a8b4d6b --- /dev/null +++ b/t/var/fixtures/excludes/_config_set @@ -0,0 +1,33 @@ +$VAR1 = { + 'belongs_to' => { + 'fetch' => 0 + }, + 'sets' => [ + { + 'class' => 'Track', + 'quantity' => 'all' + }, + { + 'quantity' => 'all', + 'class' => 'CD' + }, + { + 'class' => 'Producer', + 'quantity' => 'all' + }, + { + 'quantity' => 'all', + 'class' => 'CD_to_Producer' + }, + { + 'class' => 'Artist', + 'quantity' => 'all' + } + ], + 'has_many' => { + 'fetch' => 0 + }, + 'might_have' => { + 'fetch' => 0 + } + }; diff --git a/t/var/fixtures/multi/date.json/_config_set b/t/var/fixtures/multi/date.json/_config_set new file mode 100644 index 0000000..14ee945 --- /dev/null +++ b/t/var/fixtures/multi/date.json/_config_set @@ -0,0 +1,20 @@ +$VAR1 = { + 'might_have' => { + 'fetch' => 0 + }, + 'sets' => [ + { + 'ids' => [ + '9' + ], + 'class' => 'Track' + } + ], + 'datetime_relative' => '2007-10-30 00:00:00', + 'has_many' => { + 'fetch' => 0 + }, + 'belongs_to' => { + 'fetch' => 1 + } + }; diff --git a/t/var/fixtures/multi/rules.json/CD/5.fix b/t/var/fixtures/multi/rules.json/CD/5.fix index 0912382..344820e 100644 --- a/t/var/fixtures/multi/rules.json/CD/5.fix +++ b/t/var/fixtures/multi/rules.json/CD/5.fix @@ -1,6 +1,6 @@ $HASH1 = { artist => 2, cdid => 5, - title => "Unicode Chars \x{2122} \251 \x{2022} \x{2020} \x{2211} \x{3b1} \x{3b2} \253 \273 \x{2192} \x{2026}", + title => "Unicode Chars \342\204\242 \302\251 \342\200\242 \342\200\240 \342\210\221 \316\261 \316\262 \302\253 \302\273 \342\206\222 \342\200\246", year => 2015 }; diff --git a/t/var/fixtures/multi/rules.json/_config_set b/t/var/fixtures/multi/rules.json/_config_set new file mode 100644 index 0000000..16a91a4 --- /dev/null +++ b/t/var/fixtures/multi/rules.json/_config_set @@ -0,0 +1,54 @@ +$VAR1 = { + 'might_have' => { + 'fetch' => 0 + }, + 'sets' => [ + { + 'class' => 'CD', + 'ids' => [ + '5' + ] + }, + { + 'ids' => [ + '1' + ], + 'class' => 'Artist', + 'fetch' => [ + { + 'quantity' => 'all', + 'rel' => 'cds' + } + ] + } + ], + 'has_many' => { + 'fetch' => 0 + }, + 'rules' => { + 'CD' => { + 'fetch' => [ + { + 'cond' => { + 'position' => 2 + }, + 'rel' => 'tracks' + } + ], + 'cond' => [ + { + 'tags.tag' => 'Cheesy' + } + ], + 'join' => [ + 'tags' + ] + }, + 'might_have' => { + 'fetch' => 0 + } + }, + 'belongs_to' => { + 'fetch' => 1 + } + }; From 12bb2ea96713fa6821bbbc220982914fc10c8a87 Mon Sep 17 00:00:00 2001 From: Jens Gassmann Date: Mon, 4 May 2015 09:46:34 +0200 Subject: [PATCH 03/11] Remove ~-Files --- ..gitignore.un~ | Bin 529 -> 0 bytes .cpanfile.un~ | Bin 5052 -> 0 bytes lib/DBIx/Class/Fixtures/External/.File.pm.un~ | Bin 547 -> 0 bytes t/.19-populate-unicode.t.un~ | Bin 99674 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ..gitignore.un~ delete mode 100644 .cpanfile.un~ delete mode 100644 lib/DBIx/Class/Fixtures/External/.File.pm.un~ delete mode 100644 t/.19-populate-unicode.t.un~ diff --git a/..gitignore.un~ b/..gitignore.un~ deleted file mode 100644 index 11b49ca38cabc8a3f3fd005299b2769117a4941f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 529 zcmWH`%$*;a=aT=FfhmRc%Odg8+8>hhuLZyVdeiqRf5f{b@rlQF-LaXO)cEum0|Nsa z5W@h7%?QOHF&G;}GlWVnNMeDA#9sgjpaGB+3lM`1{0{_R?P!Wdxzq{)V00uxqvNXt X&`@S1gF#WjmXn{Hn4@pn_ZBv~9s58VGFVV7bKI zV=InE*wQtQQdq%8JmL^0z+~)$LQI7hCNyLqm$=#y9E`ojX#OtcGeBW~@usF{Dx4?R z9pC3XyRzmM9M01vC-0W+sflf&8Nhzc0a?&P)Mz3JT7xwAR85ig@Do8Jij`^=#Ttr1 zs8uY~J-ZIWJWGjrF|LgI1ezevpKo5H)&AX0$vd zy~AdDv0wCLy986aa%P|eUkCOXK4d{>5Z{sDYY8rXjqP$kUi_$Eeycv|2QOh2o+T{d zhbyV^LlU$G`Mv*He!<%GM?P?MDrX4FUK(b#q9jG%(_G@(Qu$ChGU}_9@YW(+tw2a! zqCyX1qxd`1Fp&kFL1GahW(5tiQEXH;%((sSZXx5XmYq$nROCEU&CaE>PBFh+s>oFg z6xH4fVW^JbyBJkuL1)k{`AxGr9Q&uLygGtW{SN^#eljraRi|csZeqPxSy53kerd02 p5#p`TgV+FGm_kGrbOwn%2(d`eUK_>g>(RI^+9>@DQ*WftXP>t2=coVx diff --git a/lib/DBIx/Class/Fixtures/External/.File.pm.un~ b/lib/DBIx/Class/Fixtures/External/.File.pm.un~ deleted file mode 100644 index 3e2e7132b1c49fac0e9d4554ca5ba53ef2a4333d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 547 zcmWH`%$*;a=aT=FfvMF$DR;(M_G!1xPqQso3Me$yKcA9$X2zHQ2W(cfYMxbKU|`4v zVi=GBG8my4BnD%HXogVr`w1)%k@yQB0W<)TVh3W7Aq@Y40IVIv83i;50bq2*L!;v> sD9G7>msa942i6t2d>bcnkKw90}wDI{W0L9)ZEC2ui diff --git a/t/.19-populate-unicode.t.un~ b/t/.19-populate-unicode.t.un~ deleted file mode 100644 index 659a5ef17b6cd39c198afd3e2ee73ad29b8fff35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99674 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 Date: Tue, 5 May 2015 13:31:56 +0200 Subject: [PATCH 04/11] removed hashref --- t/19-populate-unicode.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/19-populate-unicode.t b/t/19-populate-unicode.t index 59d7aff..91a0c08 100644 --- a/t/19-populate-unicode.t +++ b/t/19-populate-unicode.t @@ -15,7 +15,7 @@ use utf8; plan skip_all => 'Set $ENV{FIXTURETEST_DSN}, _USER and _PASS to point at MySQL DB to run this test' unless ($ENV{FIXTURETEST_DSN}); -ok( my $schema = DBICTest->init_schema( { dsn => $ENV{FIXTURETEST_DSN}, user => $ENV{FIXTURETEST_USER}, pass => $ENV{FIXTURETEST_PASS} } ) ); +ok( my $schema = DBICTest->init_schema( dsn => $ENV{FIXTURETEST_DSN}, user => $ENV{FIXTURETEST_USER}, pass => $ENV{FIXTURETEST_PASS} ) ); From fff7debed1c13ea6a7078a99b9ff702c01d15abd Mon Sep 17 00:00:00 2001 From: Patrick Simon Date: Tue, 5 May 2015 16:29:47 +0200 Subject: [PATCH 05/11] populate the right db --- t/19-populate-unicode.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/19-populate-unicode.t b/t/19-populate-unicode.t index 91a0c08..7efc947 100644 --- a/t/19-populate-unicode.t +++ b/t/19-populate-unicode.t @@ -54,7 +54,7 @@ ok( $fixtures->populate( { - connection_details => [ 'dbi:SQLite:' . io->catfile(qw[ t var DBIxClass.db ])->name, '', '' ], + connection_details => [ $ENV{FIXTURETEST_DSN}, $ENV{FIXTURETEST_USER}, $ENV{FIXTURETEST_PASS} ], directory => io->catfile(qw't var fixtures')->name, schema => $schema, no_deploy => 1, From abfae97441bca7527d26333e4271c045600f4e76 Mon Sep 17 00:00:00 2001 From: Patrick Simon Date: Tue, 5 May 2015 16:37:03 +0200 Subject: [PATCH 06/11] repopulate mysql database to find failures --- t/19-populate-unicode.t | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/t/19-populate-unicode.t b/t/19-populate-unicode.t index 7efc947..ec41d65 100644 --- a/t/19-populate-unicode.t +++ b/t/19-populate-unicode.t @@ -17,8 +17,6 @@ plan skip_all => 'Set $ENV{FIXTURETEST_DSN}, _USER and _PASS to point at MySQL D ok( my $schema = DBICTest->init_schema( dsn => $ENV{FIXTURETEST_DSN}, user => $ENV{FIXTURETEST_USER}, pass => $ENV{FIXTURETEST_PASS} ) ); - - #ok( my $schema = DBICTest->init_schema(), 'got schema' ); my $config_dir = io->catfile(qw't var configs')->name; @@ -51,7 +49,7 @@ ok( ), "unicode dump executed okay" ); - +DBICTest->clear_schema($schema); $fixtures->populate( { connection_details => [ $ENV{FIXTURETEST_DSN}, $ENV{FIXTURETEST_USER}, $ENV{FIXTURETEST_PASS} ], From ff3692811e209d22f46245b84be40d41b248f25c Mon Sep 17 00:00:00 2001 From: Patrick Simon Date: Tue, 5 May 2015 16:41:38 +0200 Subject: [PATCH 07/11] added utf8 features for testing --- ...BIxClass.db => .19-populate-unicode.t.un~} | Bin 9216 -> 10250 bytes t/19-populate-unicode.t | 3 ++- t/var/DBIxClassDifferent.db | Bin 4096 -> 4096 bytes t/var/fixtures/CD/5.fix | 2 +- t/var/fixtures/CD/6.fix | 2 +- t/var/fixtures/_config_set | 8 ++++---- t/var/fixtures/excludes/_config_set | 12 ++++++------ t/var/fixtures/multi/date.json/_config_set | 16 ++++++++-------- t/var/fixtures/multi/rules.json/_config_set | 18 +++++++++--------- 9 files changed, 31 insertions(+), 30 deletions(-) rename t/{var/DBIxClass.db => .19-populate-unicode.t.un~} (53%) diff --git a/t/var/DBIxClass.db b/t/.19-populate-unicode.t.un~ similarity index 53% rename from t/var/DBIxClass.db rename to t/.19-populate-unicode.t.un~ index 03417027fda90ecce4b9c5fa45a30c4147f7f1d3..43d1fa0b7836fa4ef9a17308c3ef36d91239c435 100644 GIT binary patch literal 10250 zcmeI2&rcIU6vtNt1Qmaqn0Rm!h=ru+NyQRs6p9cH!IlyYL0sA;ZY(XfTa^$FhUmc` z(f`1c2R#@)cra1Cc=BY_c=Jf~=E<|Z@9ezoA`NZ2)_9ngyw2=Qce;I__vYu0+p~|7 z*@4`O(a^TM_0^}P{rkWEc=2W~*%6Mn$B)0hcxKnLhi494c-OmZ7{(xJYq4O7qBGOe zOBY*6TSzyM?j?mFWi^sRUv4*|w#AtGfLf9UH<6#H+C>_|)h`m+6fU&X!2-#lCo2+% zVf@@j?e8SrO?sLXDDLO3bc)$|(NRcUwq{MyCk9Rp_m5cxr#otAZD-0Y?-UCnUC4^Q zsOX4|j4uohpC3!cV`H(z*wjE`WHBtrN%Cc@lZjZI>gUWtp=|x=$wXpNEQ&7C)qCWo z^cg(ZMp72|kMuLz;Xxf%j;S@foDPSE1-r;6;a`@xll}1b9bO1IVXT9-%Aq z6uNKM!yBm$Z@APq1L$`3vq%6NfJbqm;}=#4Ab^@x_ancg@&GLJ1o*uKywRQ6{W(y_ zYX!U}tku?n7uf*4Lp=@>IDzc6aiPJ(3IU|ccQ5h>)HT4%d~)dXs082Wf_IewxyerHP45ZwS?l{>hwWgiE8<8*9aTX-T z=2HBz`GJw6Z50+O25ub4w32E}FhURs`EEwO45lxA64NFZ(`Nb-=9)25U@9Gysf8r> zqf{paO!)v!^HN5sUqVNbH~qaMcwy0pL(Q_hIOh0~Fxu((Vr$erC0@5Aua;7L`FXYR zL3G5-WcaL5_I>nd9E`X@ujc<2s}s}^Z-sd)DJmQ1AE3qFOMi^P^xl5jnjJPiZ`so^ zW8ZL!d8^PJoy*M?Gp1uX=cWc_t(>8D}KhJFmoIkJL^$oe3 zzWg*H-tSc%IGhU|00fQ&C-cmp*CjAZ0D&bdIoET)b74V=mr$fAL_p#f;6lUL#MNUg zj1WX>LWI@*DN>BF2RZmk?}~7Vd>h1ly~Ka2vPnHJ0OE8-$D1-p;G`OuOO@h{54`wk cfJ?_4TO(*%6QT<7RxGNB!^>M>KMIlx~sY!HXU|c_>8$5yXGD9$H!jq0n2s6tn~^h^QC!pdS3*Y_?<}g|>&9mU+y) z_x*b_-}~);Z{EMktJ9v~Y%z?MZNc^vl_&~%nK44hcDzlzyGchv?J`&@Yv{X?+sW8% zLzCK0O_P322bD>38UDRnmHU&oK{v9NrL;X^FZf*8OHFwj6LaP9YME8XOVed0C2Taq zB;mPiYPMQFT%Kdc=cZ=H=jPeb@;sY8R%Np%rlwLQ@ zYH`E01$S%s2uTQUnJ3N1rZCmW4h|}3cPCA8T*uXV8iD9YC>{46+_xj)HN}H?+2VGz zej76RWiYb2oYFp!c-VPICs%tsU46UswnN^7$AOJVto@Y{k(^>=^LeGcyoyLogtbN# zy0OC}$6d?Op7;0aR#96QjPBFcRj&P;jymoh*0s)O@-I+5dn~UIFL3!A&DVU4<(eIf zFyU*x4%CXhJjkf*$4rNt1pa|P;dl5MR**?kia?6MqmF>4gQ5Uv8WxnQDkvsZ0Zau{ zia7-ZOf!S6)Zu#>|9`-*a2tL=CQT^y zDZl?3d`0lfe*?aS%SfgvMIc3B<04?5Z9fYnSMrwF@uQ#u=^p?fBPTfR86FAq4PTR4MQ`;G5BC>gB{J(?1PjC%BgL5zmJ2r09Q_oTa z9v%Xtx<-^K3$A{+z#|cHZy^qr*wv4G3?dAm6U#nMwR!Q-q32%G&@#5@iNJG0m$M06 zBWkjhw=b|OpRkoP7w|sMR^EA!UH^hz|B_w#lwG;VR?fYT@{jiwiU*!iv3}X2hk3vw z&tWrm5HH$}h$HT@iWe;Tyt%JXC_V)mF^krnF!q97tmMbMiB25cPEonrnhc{;i?Pqb zMYg~@)p81I#;i&s41+Z)taM1m|7Lnk#{Uht1fRoscoRIR!i!LZCvm3m8~qX0X-W~; z=m-oA>BLk<2$VRl;{q6)599tpDa#Q$-tg?GwQUQsW}Z~*oS{{d9StzwvRTJf?_nGV zS7OicT-(nLNXcHJVMMza>eBusw?&;tnSNB6TZvY&UF!*Hwu`7R8?u=YzrIs0x0_ox zN%06#X(@~_cv&S3mWDF29tu}wv$)Xsv?&d9`vE4y)4msAh#wp)7RL4!SfTKIat-t) zCIsk_#H8PlkI503PuOj`RPQ7dD#CM4wb+p`;H?3zQ;E`wh`dHCr^-r2f~@SpPJ5!x zDzW46W>dz$2_F#n3x0uH*av(E7jYbL0Yzy_5l9jEUl7QcxDS_AE7*;-GJTS!3BAcc zI;Tz4vDa#C(j}v=GMZ#)hcQ)TEKQCKOpqibB$XtUWS^oE(~^{oe}HcYuKnM{B26g* zDFTle0v1mHi<5GyAjc`k>pTcWtHG01fKs@SNK3Kj<49&Rt^(|wv4vn2R*k|~$oMzN zD+I4w%CPb--An(5GxrC;W4l56us51F{?_~BbkJc#oE&+}FtWqLO8Z!HwxGMS-!1!k U&J%Q{$w`7P^B`v$)|_1V59!4f>Hq)$ diff --git a/t/19-populate-unicode.t b/t/19-populate-unicode.t index ec41d65..adc76f9 100644 --- a/t/19-populate-unicode.t +++ b/t/19-populate-unicode.t @@ -8,7 +8,8 @@ use Path::Class; use Data::Dumper; use IO::All; use Test::mysqld; -use utf8; +use utf8::all; +use feature 'unicode_strings'; # set up and populate schema diff --git a/t/var/DBIxClassDifferent.db b/t/var/DBIxClassDifferent.db index e121d0bcf005fb2f397005a3828b81b8b8cf735c..d1ed1e96f161c79f118f56e18d00f74747fec9b5 100644 GIT binary patch delta 16 XcmZorXi(U|&%?;PS&-vBGa~~4B}fC$ delta 16 XcmZorXi(U|&%?;HS&-vBGa~~4B|rnt diff --git a/t/var/fixtures/CD/5.fix b/t/var/fixtures/CD/5.fix index 344820e..0912382 100644 --- a/t/var/fixtures/CD/5.fix +++ b/t/var/fixtures/CD/5.fix @@ -1,6 +1,6 @@ $HASH1 = { artist => 2, cdid => 5, - title => "Unicode Chars \342\204\242 \302\251 \342\200\242 \342\200\240 \342\210\221 \316\261 \316\262 \302\253 \302\273 \342\206\222 \342\200\246", + title => "Unicode Chars \x{2122} \251 \x{2022} \x{2020} \x{2211} \x{3b1} \x{3b2} \253 \273 \x{2192} \x{2026}", year => 2015 }; diff --git a/t/var/fixtures/CD/6.fix b/t/var/fixtures/CD/6.fix index 8519567..11a0d17 100644 --- a/t/var/fixtures/CD/6.fix +++ b/t/var/fixtures/CD/6.fix @@ -1,6 +1,6 @@ $HASH1 = { artist => 3, cdid => 6, - title => "\303\234bertreibung \303\244lterer Umlaute", + title => "\334bertreibung \344lterer Umlaute", year => 1998 }; diff --git a/t/var/fixtures/_config_set b/t/var/fixtures/_config_set index 1f2eb6e..b92e629 100644 --- a/t/var/fixtures/_config_set +++ b/t/var/fixtures/_config_set @@ -2,8 +2,8 @@ $VAR1 = { 'has_many' => { 'fetch' => 0 }, - 'belongs_to' => { - 'fetch' => 1 + 'might_have' => { + 'fetch' => 0 }, 'sets' => [ { @@ -11,7 +11,7 @@ $VAR1 = { 'class' => 'CD' } ], - 'might_have' => { - 'fetch' => 0 + 'belongs_to' => { + 'fetch' => 1 } }; diff --git a/t/var/fixtures/excludes/_config_set b/t/var/fixtures/excludes/_config_set index a8b4d6b..adf1ab8 100644 --- a/t/var/fixtures/excludes/_config_set +++ b/t/var/fixtures/excludes/_config_set @@ -4,23 +4,23 @@ $VAR1 = { }, 'sets' => [ { - 'class' => 'Track', - 'quantity' => 'all' + 'quantity' => 'all', + 'class' => 'CD_to_Producer' }, { 'quantity' => 'all', - 'class' => 'CD' + 'class' => 'Artist' }, { - 'class' => 'Producer', + 'class' => 'Track', 'quantity' => 'all' }, { 'quantity' => 'all', - 'class' => 'CD_to_Producer' + 'class' => 'Producer' }, { - 'class' => 'Artist', + 'class' => 'CD', 'quantity' => 'all' } ], diff --git a/t/var/fixtures/multi/date.json/_config_set b/t/var/fixtures/multi/date.json/_config_set index 14ee945..5fed2a6 100644 --- a/t/var/fixtures/multi/date.json/_config_set +++ b/t/var/fixtures/multi/date.json/_config_set @@ -1,4 +1,11 @@ $VAR1 = { + 'belongs_to' => { + 'fetch' => 1 + }, + 'has_many' => { + 'fetch' => 0 + }, + 'datetime_relative' => '2007-10-30 00:00:00', 'might_have' => { 'fetch' => 0 }, @@ -9,12 +16,5 @@ $VAR1 = { ], 'class' => 'Track' } - ], - 'datetime_relative' => '2007-10-30 00:00:00', - 'has_many' => { - 'fetch' => 0 - }, - 'belongs_to' => { - 'fetch' => 1 - } + ] }; diff --git a/t/var/fixtures/multi/rules.json/_config_set b/t/var/fixtures/multi/rules.json/_config_set index 16a91a4..728c883 100644 --- a/t/var/fixtures/multi/rules.json/_config_set +++ b/t/var/fixtures/multi/rules.json/_config_set @@ -4,16 +4,16 @@ $VAR1 = { }, 'sets' => [ { - 'class' => 'CD', 'ids' => [ '5' - ] + ], + 'class' => 'CD' }, { + 'class' => 'Artist', 'ids' => [ '1' ], - 'class' => 'Artist', 'fetch' => [ { 'quantity' => 'all', @@ -22,17 +22,14 @@ $VAR1 = { ] } ], - 'has_many' => { - 'fetch' => 0 - }, 'rules' => { 'CD' => { 'fetch' => [ { + 'rel' => 'tracks', 'cond' => { 'position' => 2 - }, - 'rel' => 'tracks' + } } ], 'cond' => [ @@ -50,5 +47,8 @@ $VAR1 = { }, 'belongs_to' => { 'fetch' => 1 - } + }, + 'has_many' => { + 'fetch' => 0 + } }; From ce0b48771d004e5b14b013bb8e0f35ebd043568d Mon Sep 17 00:00:00 2001 From: Patrick Simon Date: Tue, 5 May 2015 16:58:57 +0200 Subject: [PATCH 08/11] removed fix files --- t/var/fixtures/excludes/CD/5.fix | 6 ------ t/var/fixtures/multi/rules.json/CD/5.fix | 6 ------ 2 files changed, 12 deletions(-) delete mode 100644 t/var/fixtures/excludes/CD/5.fix delete mode 100644 t/var/fixtures/multi/rules.json/CD/5.fix diff --git a/t/var/fixtures/excludes/CD/5.fix b/t/var/fixtures/excludes/CD/5.fix deleted file mode 100644 index 344820e..0000000 --- a/t/var/fixtures/excludes/CD/5.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 2, - cdid => 5, - title => "Unicode Chars \342\204\242 \302\251 \342\200\242 \342\200\240 \342\210\221 \316\261 \316\262 \302\253 \302\273 \342\206\222 \342\200\246", - year => 2015 - }; diff --git a/t/var/fixtures/multi/rules.json/CD/5.fix b/t/var/fixtures/multi/rules.json/CD/5.fix deleted file mode 100644 index 344820e..0000000 --- a/t/var/fixtures/multi/rules.json/CD/5.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 2, - cdid => 5, - title => "Unicode Chars \342\204\242 \302\251 \342\200\242 \342\200\240 \342\210\221 \316\261 \316\262 \302\253 \302\273 \342\206\222 \342\200\246", - year => 2015 - }; From 0f43abe31ff08aaa7991377e8729692abed2a641 Mon Sep 17 00:00:00 2001 From: Patrick Simon Date: Tue, 5 May 2015 16:59:21 +0200 Subject: [PATCH 09/11] removed debug output --- t/lib/DBICTest.pm | 3 --- 1 file changed, 3 deletions(-) diff --git a/t/lib/DBICTest.pm b/t/lib/DBICTest.pm index e454d98..61a6b30 100755 --- a/t/lib/DBICTest.pm +++ b/t/lib/DBICTest.pm @@ -62,9 +62,6 @@ sub init_schema { my $schema; - use DDP; - p $dsn; - my @connect_info = ($dsn, $dbuser, $dbpass, { AutoCommit => 1, mysql_enable_utf8 => 1 }); if ($args{compose_connection}) { From 0501654ea5fc6c0b6164b1b206edc63648c1e8cd Mon Sep 17 00:00:00 2001 From: Patrick Simon Date: Tue, 5 May 2015 17:01:41 +0200 Subject: [PATCH 10/11] removed fixtures --- t/var/fixtures/CD/1.fix | 6 --- t/var/fixtures/CD/2.fix | 6 --- t/var/fixtures/CD/3.fix | 6 --- t/var/fixtures/CD/4.fix | 6 --- t/var/fixtures/CD/5.fix | 6 --- t/var/fixtures/CD/6.fix | 6 --- t/var/fixtures/artist/1.fix | 4 -- t/var/fixtures/artist/2.fix | 4 -- t/var/fixtures/artist/3.fix | 4 -- t/var/fixtures/excludes/CD/1.fix | 6 --- t/var/fixtures/excludes/CD/2.fix | 6 --- t/var/fixtures/excludes/CD/3.fix | 6 --- t/var/fixtures/excludes/CD/4.fix | 6 --- t/var/fixtures/excludes/CD/6.fix | 6 --- t/var/fixtures/excludes/artist/1.fix | 4 -- t/var/fixtures/excludes/artist/2.fix | 4 -- t/var/fixtures/excludes/artist/3.fix | 4 -- t/var/fixtures/excludes/artist/32948.fix | 4 -- t/var/fixtures/excludes/artist/4.fix | 4 -- .../fixtures/excludes/cd_to_producer/1-1.fix | 4 -- .../fixtures/excludes/cd_to_producer/1-2.fix | 4 -- .../fixtures/excludes/cd_to_producer/1-3.fix | 4 -- .../fixtures/excludes/cd_to_producer/2-1.fix | 4 -- .../fixtures/excludes/cd_to_producer/2-2.fix | 4 -- .../fixtures/excludes/cd_to_producer/3-3.fix | 4 -- t/var/fixtures/excludes/producer/1.fix | 4 -- t/var/fixtures/excludes/producer/2.fix | 4 -- t/var/fixtures/excludes/producer/3.fix | 4 -- t/var/fixtures/excludes/track/10.fix | 9 ---- t/var/fixtures/excludes/track/11.fix | 9 ---- t/var/fixtures/excludes/track/12.fix | 9 ---- t/var/fixtures/excludes/track/13.fix | 9 ---- t/var/fixtures/excludes/track/14.fix | 9 ---- t/var/fixtures/excludes/track/15.fix | 9 ---- t/var/fixtures/excludes/track/16.fix | 9 ---- t/var/fixtures/excludes/track/17.fix | 9 ---- t/var/fixtures/excludes/track/18.fix | 9 ---- t/var/fixtures/excludes/track/4.fix | 9 ---- t/var/fixtures/excludes/track/5.fix | 9 ---- t/var/fixtures/excludes/track/6.fix | 9 ---- t/var/fixtures/excludes/track/7.fix | 9 ---- t/var/fixtures/excludes/track/8.fix | 9 ---- t/var/fixtures/excludes/track/9.fix | 9 ---- t/var/fixtures/multi/date.json/CD/3.fix | 6 --- t/var/fixtures/multi/date.json/_config_set | 20 ------- .../fixtures/multi/date.json/_dumper_version | 1 - t/var/fixtures/multi/date.json/artist/1.fix | 4 -- t/var/fixtures/multi/date.json/track/9.fix | 19 ------- t/var/fixtures/multi/rules.json/CD/2.fix | 6 --- t/var/fixtures/multi/rules.json/_config_set | 54 ------------------- .../fixtures/multi/rules.json/_dumper_version | 1 - t/var/fixtures/multi/rules.json/artist/1.fix | 4 -- t/var/fixtures/multi/rules.json/artist/2.fix | 4 -- t/var/fixtures/multi/rules.json/track/14.fix | 9 ---- t/var/fixtures/multi/rules.json/track/5.fix | 9 ---- 55 files changed, 406 deletions(-) delete mode 100644 t/var/fixtures/CD/1.fix delete mode 100644 t/var/fixtures/CD/2.fix delete mode 100644 t/var/fixtures/CD/3.fix delete mode 100644 t/var/fixtures/CD/4.fix delete mode 100644 t/var/fixtures/CD/5.fix delete mode 100644 t/var/fixtures/CD/6.fix delete mode 100644 t/var/fixtures/artist/1.fix delete mode 100644 t/var/fixtures/artist/2.fix delete mode 100644 t/var/fixtures/artist/3.fix delete mode 100644 t/var/fixtures/excludes/CD/1.fix delete mode 100644 t/var/fixtures/excludes/CD/2.fix delete mode 100644 t/var/fixtures/excludes/CD/3.fix delete mode 100644 t/var/fixtures/excludes/CD/4.fix delete mode 100644 t/var/fixtures/excludes/CD/6.fix delete mode 100644 t/var/fixtures/excludes/artist/1.fix delete mode 100644 t/var/fixtures/excludes/artist/2.fix delete mode 100644 t/var/fixtures/excludes/artist/3.fix delete mode 100644 t/var/fixtures/excludes/artist/32948.fix delete mode 100644 t/var/fixtures/excludes/artist/4.fix delete mode 100644 t/var/fixtures/excludes/cd_to_producer/1-1.fix delete mode 100644 t/var/fixtures/excludes/cd_to_producer/1-2.fix delete mode 100644 t/var/fixtures/excludes/cd_to_producer/1-3.fix delete mode 100644 t/var/fixtures/excludes/cd_to_producer/2-1.fix delete mode 100644 t/var/fixtures/excludes/cd_to_producer/2-2.fix delete mode 100644 t/var/fixtures/excludes/cd_to_producer/3-3.fix delete mode 100644 t/var/fixtures/excludes/producer/1.fix delete mode 100644 t/var/fixtures/excludes/producer/2.fix delete mode 100644 t/var/fixtures/excludes/producer/3.fix delete mode 100644 t/var/fixtures/excludes/track/10.fix delete mode 100644 t/var/fixtures/excludes/track/11.fix delete mode 100644 t/var/fixtures/excludes/track/12.fix delete mode 100644 t/var/fixtures/excludes/track/13.fix delete mode 100644 t/var/fixtures/excludes/track/14.fix delete mode 100644 t/var/fixtures/excludes/track/15.fix delete mode 100644 t/var/fixtures/excludes/track/16.fix delete mode 100644 t/var/fixtures/excludes/track/17.fix delete mode 100644 t/var/fixtures/excludes/track/18.fix delete mode 100644 t/var/fixtures/excludes/track/4.fix delete mode 100644 t/var/fixtures/excludes/track/5.fix delete mode 100644 t/var/fixtures/excludes/track/6.fix delete mode 100644 t/var/fixtures/excludes/track/7.fix delete mode 100644 t/var/fixtures/excludes/track/8.fix delete mode 100644 t/var/fixtures/excludes/track/9.fix delete mode 100644 t/var/fixtures/multi/date.json/CD/3.fix delete mode 100644 t/var/fixtures/multi/date.json/_config_set delete mode 100644 t/var/fixtures/multi/date.json/_dumper_version delete mode 100644 t/var/fixtures/multi/date.json/artist/1.fix delete mode 100644 t/var/fixtures/multi/date.json/track/9.fix delete mode 100644 t/var/fixtures/multi/rules.json/CD/2.fix delete mode 100644 t/var/fixtures/multi/rules.json/_config_set delete mode 100644 t/var/fixtures/multi/rules.json/_dumper_version delete mode 100644 t/var/fixtures/multi/rules.json/artist/1.fix delete mode 100644 t/var/fixtures/multi/rules.json/artist/2.fix delete mode 100644 t/var/fixtures/multi/rules.json/track/14.fix delete mode 100644 t/var/fixtures/multi/rules.json/track/5.fix diff --git a/t/var/fixtures/CD/1.fix b/t/var/fixtures/CD/1.fix deleted file mode 100644 index b7f372b..0000000 --- a/t/var/fixtures/CD/1.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 1, - cdid => 1, - title => 'Spoonful of bees', - year => 1999 - }; diff --git a/t/var/fixtures/CD/2.fix b/t/var/fixtures/CD/2.fix deleted file mode 100644 index a6b679a..0000000 --- a/t/var/fixtures/CD/2.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 1, - cdid => 2, - title => 'Forkful of bees', - year => 2001 - }; diff --git a/t/var/fixtures/CD/3.fix b/t/var/fixtures/CD/3.fix deleted file mode 100644 index 96c1068..0000000 --- a/t/var/fixtures/CD/3.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 1, - cdid => 3, - title => 'Caterwaulin\' Blues', - year => 1997 - }; diff --git a/t/var/fixtures/CD/4.fix b/t/var/fixtures/CD/4.fix deleted file mode 100644 index 26d5952..0000000 --- a/t/var/fixtures/CD/4.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 2, - cdid => 4, - title => 'Generic Manufactured Singles', - year => 2001 - }; diff --git a/t/var/fixtures/CD/5.fix b/t/var/fixtures/CD/5.fix deleted file mode 100644 index 0912382..0000000 --- a/t/var/fixtures/CD/5.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 2, - cdid => 5, - title => "Unicode Chars \x{2122} \251 \x{2022} \x{2020} \x{2211} \x{3b1} \x{3b2} \253 \273 \x{2192} \x{2026}", - year => 2015 - }; diff --git a/t/var/fixtures/CD/6.fix b/t/var/fixtures/CD/6.fix deleted file mode 100644 index 11a0d17..0000000 --- a/t/var/fixtures/CD/6.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 3, - cdid => 6, - title => "\334bertreibung \344lterer Umlaute", - year => 1998 - }; diff --git a/t/var/fixtures/artist/1.fix b/t/var/fixtures/artist/1.fix deleted file mode 100644 index cd82bac..0000000 --- a/t/var/fixtures/artist/1.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - artistid => 1, - name => 'Caterwauler McCrae' - }; diff --git a/t/var/fixtures/artist/2.fix b/t/var/fixtures/artist/2.fix deleted file mode 100644 index 997aaaf..0000000 --- a/t/var/fixtures/artist/2.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - artistid => 2, - name => 'Random Boy Band' - }; diff --git a/t/var/fixtures/artist/3.fix b/t/var/fixtures/artist/3.fix deleted file mode 100644 index d117d39..0000000 --- a/t/var/fixtures/artist/3.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - artistid => 3, - name => 'We Are Goth' - }; diff --git a/t/var/fixtures/excludes/CD/1.fix b/t/var/fixtures/excludes/CD/1.fix deleted file mode 100644 index b7f372b..0000000 --- a/t/var/fixtures/excludes/CD/1.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 1, - cdid => 1, - title => 'Spoonful of bees', - year => 1999 - }; diff --git a/t/var/fixtures/excludes/CD/2.fix b/t/var/fixtures/excludes/CD/2.fix deleted file mode 100644 index a6b679a..0000000 --- a/t/var/fixtures/excludes/CD/2.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 1, - cdid => 2, - title => 'Forkful of bees', - year => 2001 - }; diff --git a/t/var/fixtures/excludes/CD/3.fix b/t/var/fixtures/excludes/CD/3.fix deleted file mode 100644 index 96c1068..0000000 --- a/t/var/fixtures/excludes/CD/3.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 1, - cdid => 3, - title => 'Caterwaulin\' Blues', - year => 1997 - }; diff --git a/t/var/fixtures/excludes/CD/4.fix b/t/var/fixtures/excludes/CD/4.fix deleted file mode 100644 index 26d5952..0000000 --- a/t/var/fixtures/excludes/CD/4.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 2, - cdid => 4, - title => 'Generic Manufactured Singles', - year => 2001 - }; diff --git a/t/var/fixtures/excludes/CD/6.fix b/t/var/fixtures/excludes/CD/6.fix deleted file mode 100644 index 8519567..0000000 --- a/t/var/fixtures/excludes/CD/6.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 3, - cdid => 6, - title => "\303\234bertreibung \303\244lterer Umlaute", - year => 1998 - }; diff --git a/t/var/fixtures/excludes/artist/1.fix b/t/var/fixtures/excludes/artist/1.fix deleted file mode 100644 index cd82bac..0000000 --- a/t/var/fixtures/excludes/artist/1.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - artistid => 1, - name => 'Caterwauler McCrae' - }; diff --git a/t/var/fixtures/excludes/artist/2.fix b/t/var/fixtures/excludes/artist/2.fix deleted file mode 100644 index 997aaaf..0000000 --- a/t/var/fixtures/excludes/artist/2.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - artistid => 2, - name => 'Random Boy Band' - }; diff --git a/t/var/fixtures/excludes/artist/3.fix b/t/var/fixtures/excludes/artist/3.fix deleted file mode 100644 index d117d39..0000000 --- a/t/var/fixtures/excludes/artist/3.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - artistid => 3, - name => 'We Are Goth' - }; diff --git a/t/var/fixtures/excludes/artist/32948.fix b/t/var/fixtures/excludes/artist/32948.fix deleted file mode 100644 index f8f2fce..0000000 --- a/t/var/fixtures/excludes/artist/32948.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - artistid => 32948, - name => 'Big PK' - }; diff --git a/t/var/fixtures/excludes/artist/4.fix b/t/var/fixtures/excludes/artist/4.fix deleted file mode 100644 index 479e5ea..0000000 --- a/t/var/fixtures/excludes/artist/4.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - artistid => 4, - name => '' - }; diff --git a/t/var/fixtures/excludes/cd_to_producer/1-1.fix b/t/var/fixtures/excludes/cd_to_producer/1-1.fix deleted file mode 100644 index c08f3b2..0000000 --- a/t/var/fixtures/excludes/cd_to_producer/1-1.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - cd => 1, - producer => 1 - }; diff --git a/t/var/fixtures/excludes/cd_to_producer/1-2.fix b/t/var/fixtures/excludes/cd_to_producer/1-2.fix deleted file mode 100644 index 58f94f1..0000000 --- a/t/var/fixtures/excludes/cd_to_producer/1-2.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - cd => 1, - producer => 2 - }; diff --git a/t/var/fixtures/excludes/cd_to_producer/1-3.fix b/t/var/fixtures/excludes/cd_to_producer/1-3.fix deleted file mode 100644 index c9ed9a5..0000000 --- a/t/var/fixtures/excludes/cd_to_producer/1-3.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - cd => 1, - producer => 3 - }; diff --git a/t/var/fixtures/excludes/cd_to_producer/2-1.fix b/t/var/fixtures/excludes/cd_to_producer/2-1.fix deleted file mode 100644 index f19c713..0000000 --- a/t/var/fixtures/excludes/cd_to_producer/2-1.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - cd => 2, - producer => 1 - }; diff --git a/t/var/fixtures/excludes/cd_to_producer/2-2.fix b/t/var/fixtures/excludes/cd_to_producer/2-2.fix deleted file mode 100644 index 00981e1..0000000 --- a/t/var/fixtures/excludes/cd_to_producer/2-2.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - cd => 2, - producer => 2 - }; diff --git a/t/var/fixtures/excludes/cd_to_producer/3-3.fix b/t/var/fixtures/excludes/cd_to_producer/3-3.fix deleted file mode 100644 index fb5b464..0000000 --- a/t/var/fixtures/excludes/cd_to_producer/3-3.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - cd => 3, - producer => 3 - }; diff --git a/t/var/fixtures/excludes/producer/1.fix b/t/var/fixtures/excludes/producer/1.fix deleted file mode 100644 index a8964e1..0000000 --- a/t/var/fixtures/excludes/producer/1.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - name => 'Matt S Trout', - producerid => 1 - }; diff --git a/t/var/fixtures/excludes/producer/2.fix b/t/var/fixtures/excludes/producer/2.fix deleted file mode 100644 index a3b207b..0000000 --- a/t/var/fixtures/excludes/producer/2.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - name => 'Bob The Builder', - producerid => 2 - }; diff --git a/t/var/fixtures/excludes/producer/3.fix b/t/var/fixtures/excludes/producer/3.fix deleted file mode 100644 index b01cc0d..0000000 --- a/t/var/fixtures/excludes/producer/3.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - name => 'Fred The Phenotype', - producerid => 3 - }; diff --git a/t/var/fixtures/excludes/track/10.fix b/t/var/fixtures/excludes/track/10.fix deleted file mode 100644 index e6e9afd..0000000 --- a/t/var/fixtures/excludes/track/10.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 4, - last_updated_on - => undef, - position - => 1, - title => 'Boring Name', - trackid => 10 - }; diff --git a/t/var/fixtures/excludes/track/11.fix b/t/var/fixtures/excludes/track/11.fix deleted file mode 100644 index 5b19269..0000000 --- a/t/var/fixtures/excludes/track/11.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 4, - last_updated_on - => undef, - position - => 2, - title => 'Boring Song', - trackid => 11 - }; diff --git a/t/var/fixtures/excludes/track/12.fix b/t/var/fixtures/excludes/track/12.fix deleted file mode 100644 index 418ccdc..0000000 --- a/t/var/fixtures/excludes/track/12.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 4, - last_updated_on - => undef, - position - => 3, - title => 'No More Ideas', - trackid => 12 - }; diff --git a/t/var/fixtures/excludes/track/13.fix b/t/var/fixtures/excludes/track/13.fix deleted file mode 100644 index b42ba45..0000000 --- a/t/var/fixtures/excludes/track/13.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 5, - last_updated_on - => undef, - position - => 1, - title => 'Sad', - trackid => 13 - }; diff --git a/t/var/fixtures/excludes/track/14.fix b/t/var/fixtures/excludes/track/14.fix deleted file mode 100644 index 1fcd807..0000000 --- a/t/var/fixtures/excludes/track/14.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 5, - last_updated_on - => undef, - position - => 2, - title => 'Under The Weather', - trackid => 14 - }; diff --git a/t/var/fixtures/excludes/track/15.fix b/t/var/fixtures/excludes/track/15.fix deleted file mode 100644 index 8b82fd2..0000000 --- a/t/var/fixtures/excludes/track/15.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 5, - last_updated_on - => undef, - position - => 3, - title => 'Suicidal', - trackid => 15 - }; diff --git a/t/var/fixtures/excludes/track/16.fix b/t/var/fixtures/excludes/track/16.fix deleted file mode 100644 index 2f5d4aa..0000000 --- a/t/var/fixtures/excludes/track/16.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 1, - last_updated_on - => undef, - position - => 1, - title => 'The Bees Knees', - trackid => 16 - }; diff --git a/t/var/fixtures/excludes/track/17.fix b/t/var/fixtures/excludes/track/17.fix deleted file mode 100644 index d5accd5..0000000 --- a/t/var/fixtures/excludes/track/17.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 1, - last_updated_on - => undef, - position - => 2, - title => 'Apiary', - trackid => 17 - }; diff --git a/t/var/fixtures/excludes/track/18.fix b/t/var/fixtures/excludes/track/18.fix deleted file mode 100644 index abc8e4c..0000000 --- a/t/var/fixtures/excludes/track/18.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 1, - last_updated_on - => undef, - position - => 3, - title => 'Beehind You', - trackid => 18 - }; diff --git a/t/var/fixtures/excludes/track/4.fix b/t/var/fixtures/excludes/track/4.fix deleted file mode 100644 index 8699ddc..0000000 --- a/t/var/fixtures/excludes/track/4.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 2, - last_updated_on - => undef, - position - => 1, - title => 'Stung with Success', - trackid => 4 - }; diff --git a/t/var/fixtures/excludes/track/5.fix b/t/var/fixtures/excludes/track/5.fix deleted file mode 100644 index 1b8cdb4..0000000 --- a/t/var/fixtures/excludes/track/5.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 2, - last_updated_on - => undef, - position - => 2, - title => 'Stripy', - trackid => 5 - }; diff --git a/t/var/fixtures/excludes/track/6.fix b/t/var/fixtures/excludes/track/6.fix deleted file mode 100644 index 5ad6ff4..0000000 --- a/t/var/fixtures/excludes/track/6.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 2, - last_updated_on - => undef, - position - => 3, - title => 'Sticky Honey', - trackid => 6 - }; diff --git a/t/var/fixtures/excludes/track/7.fix b/t/var/fixtures/excludes/track/7.fix deleted file mode 100644 index 7d1ffd8..0000000 --- a/t/var/fixtures/excludes/track/7.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 3, - last_updated_on - => undef, - position - => 1, - title => 'Yowlin', - trackid => 7 - }; diff --git a/t/var/fixtures/excludes/track/8.fix b/t/var/fixtures/excludes/track/8.fix deleted file mode 100644 index 1e5a7fd..0000000 --- a/t/var/fixtures/excludes/track/8.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 3, - last_updated_on - => undef, - position - => 2, - title => 'Howlin', - trackid => 8 - }; diff --git a/t/var/fixtures/excludes/track/9.fix b/t/var/fixtures/excludes/track/9.fix deleted file mode 100644 index 3679235..0000000 --- a/t/var/fixtures/excludes/track/9.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 3, - last_updated_on - => '2007-10-20 00:00:00', - position - => 3, - title => 'Fowlin', - trackid => 9 - }; diff --git a/t/var/fixtures/multi/date.json/CD/3.fix b/t/var/fixtures/multi/date.json/CD/3.fix deleted file mode 100644 index 96c1068..0000000 --- a/t/var/fixtures/multi/date.json/CD/3.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 1, - cdid => 3, - title => 'Caterwaulin\' Blues', - year => 1997 - }; diff --git a/t/var/fixtures/multi/date.json/_config_set b/t/var/fixtures/multi/date.json/_config_set deleted file mode 100644 index 5fed2a6..0000000 --- a/t/var/fixtures/multi/date.json/_config_set +++ /dev/null @@ -1,20 +0,0 @@ -$VAR1 = { - 'belongs_to' => { - 'fetch' => 1 - }, - 'has_many' => { - 'fetch' => 0 - }, - 'datetime_relative' => '2007-10-30 00:00:00', - 'might_have' => { - 'fetch' => 0 - }, - 'sets' => [ - { - 'ids' => [ - '9' - ], - 'class' => 'Track' - } - ] - }; diff --git a/t/var/fixtures/multi/date.json/_dumper_version b/t/var/fixtures/multi/date.json/_dumper_version deleted file mode 100644 index 85690d1..0000000 --- a/t/var/fixtures/multi/date.json/_dumper_version +++ /dev/null @@ -1 +0,0 @@ -1.001029 \ No newline at end of file diff --git a/t/var/fixtures/multi/date.json/artist/1.fix b/t/var/fixtures/multi/date.json/artist/1.fix deleted file mode 100644 index cd82bac..0000000 --- a/t/var/fixtures/multi/date.json/artist/1.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - artistid => 1, - name => 'Caterwauler McCrae' - }; diff --git a/t/var/fixtures/multi/date.json/track/9.fix b/t/var/fixtures/multi/date.json/track/9.fix deleted file mode 100644 index f9c9e67..0000000 --- a/t/var/fixtures/multi/date.json/track/9.fix +++ /dev/null @@ -1,19 +0,0 @@ -$HASH1 = { - cd => 3, - last_updated_on - => { - days => -10, - end_of_month - => 'wrap', - minutes => 0, - months => 0, - nanoseconds - => 0, - seconds => 0 - }, - position - => 3, - title => 'Fowlin', - trackid => 9 - }; -bless( $HASH1->{last_updated_on}, 'DateTime::Duration' ); diff --git a/t/var/fixtures/multi/rules.json/CD/2.fix b/t/var/fixtures/multi/rules.json/CD/2.fix deleted file mode 100644 index a6b679a..0000000 --- a/t/var/fixtures/multi/rules.json/CD/2.fix +++ /dev/null @@ -1,6 +0,0 @@ -$HASH1 = { - artist => 1, - cdid => 2, - title => 'Forkful of bees', - year => 2001 - }; diff --git a/t/var/fixtures/multi/rules.json/_config_set b/t/var/fixtures/multi/rules.json/_config_set deleted file mode 100644 index 728c883..0000000 --- a/t/var/fixtures/multi/rules.json/_config_set +++ /dev/null @@ -1,54 +0,0 @@ -$VAR1 = { - 'might_have' => { - 'fetch' => 0 - }, - 'sets' => [ - { - 'ids' => [ - '5' - ], - 'class' => 'CD' - }, - { - 'class' => 'Artist', - 'ids' => [ - '1' - ], - 'fetch' => [ - { - 'quantity' => 'all', - 'rel' => 'cds' - } - ] - } - ], - 'rules' => { - 'CD' => { - 'fetch' => [ - { - 'rel' => 'tracks', - 'cond' => { - 'position' => 2 - } - } - ], - 'cond' => [ - { - 'tags.tag' => 'Cheesy' - } - ], - 'join' => [ - 'tags' - ] - }, - 'might_have' => { - 'fetch' => 0 - } - }, - 'belongs_to' => { - 'fetch' => 1 - }, - 'has_many' => { - 'fetch' => 0 - } - }; diff --git a/t/var/fixtures/multi/rules.json/_dumper_version b/t/var/fixtures/multi/rules.json/_dumper_version deleted file mode 100644 index 85690d1..0000000 --- a/t/var/fixtures/multi/rules.json/_dumper_version +++ /dev/null @@ -1 +0,0 @@ -1.001029 \ No newline at end of file diff --git a/t/var/fixtures/multi/rules.json/artist/1.fix b/t/var/fixtures/multi/rules.json/artist/1.fix deleted file mode 100644 index cd82bac..0000000 --- a/t/var/fixtures/multi/rules.json/artist/1.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - artistid => 1, - name => 'Caterwauler McCrae' - }; diff --git a/t/var/fixtures/multi/rules.json/artist/2.fix b/t/var/fixtures/multi/rules.json/artist/2.fix deleted file mode 100644 index 997aaaf..0000000 --- a/t/var/fixtures/multi/rules.json/artist/2.fix +++ /dev/null @@ -1,4 +0,0 @@ -$HASH1 = { - artistid => 2, - name => 'Random Boy Band' - }; diff --git a/t/var/fixtures/multi/rules.json/track/14.fix b/t/var/fixtures/multi/rules.json/track/14.fix deleted file mode 100644 index 1fcd807..0000000 --- a/t/var/fixtures/multi/rules.json/track/14.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 5, - last_updated_on - => undef, - position - => 2, - title => 'Under The Weather', - trackid => 14 - }; diff --git a/t/var/fixtures/multi/rules.json/track/5.fix b/t/var/fixtures/multi/rules.json/track/5.fix deleted file mode 100644 index 1b8cdb4..0000000 --- a/t/var/fixtures/multi/rules.json/track/5.fix +++ /dev/null @@ -1,9 +0,0 @@ -$HASH1 = { - cd => 2, - last_updated_on - => undef, - position - => 2, - title => 'Stripy', - trackid => 5 - }; From 29bd6b9ad95597ff05b37d595a13d6682cbb4146 Mon Sep 17 00:00:00 2001 From: Patrick Simon Date: Tue, 5 May 2015 17:13:01 +0200 Subject: [PATCH 11/11] merged master --- t/lib/.DBICTest.pm.un~ | Bin 26894 -> 0 bytes t/var/DBIxClassDifferent.db | Bin 4096 -> 4096 bytes t/var/fixtures/_config_set | 12 ++++++------ t/var/fixtures/excludes/_config_set | 18 +++++++++--------- 4 files changed, 15 insertions(+), 15 deletions(-) delete mode 100755 t/lib/.DBICTest.pm.un~ diff --git a/t/lib/.DBICTest.pm.un~ b/t/lib/.DBICTest.pm.un~ deleted file mode 100755 index 4d1a74375c2de756eb5e025cc1fad17547a601c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26894 zcmeI*-)|IE6bJAv6sVx$4@49Sm(oHD+m=#58U$OwANX5wsY*!GAJcRbx?8(j6Qe$u z_$Z41fS8~!zMA-8cD+MH!$5b>J)b+f zv%52w^X1vArOKJ=jl!C@yRLlq`Pp~YT{iE3^JmMJPlGRR41L+w-u=r@KaRX{eClGM zQ25^VxNWwFWZ*?1{<`k zas^5~8-EQs3WcR@_P#%`{X^TowH+h}Ow=xzfg*l&oSUmwE7J>?Om*5!1VOFCZXOyM zG8cw_*lv5=psS*BHN4+i(ciK}_ost5bfhwZjgw#T$DgLd{cGdx+XRD#L+Sh+G?H787W=TxmyG@Vlu z3$mJG$^FZyX zAfixg|AN@Q`2jzu_tWq&4V0b=A_~Ry=fw0)-|9j70F4f_K;@|*qEIaVyjZ^3dwf8L zA2&n;#3WF7kv9Es9{9ej4|$#w!#DYC2hP2eDdvE>Q$a+b*!@|td-_LuV2(d�W73 zlpU2=jV5M)M$Df2K`xa0X@Hmks!jzFg<|!m#p-FF-UIm{4Ga@N(WxM!P>lYR7(L}1 z8yFAJxZtnmR1i@pHh)rVp8S#y#D{2D;8$`gh$s}3KOrVhd@T#%K^hhGRh$YU3dQ1& zi^c!>Jv@L9)1ZK_;8YM%CKCA8#u{J-G12?{24C4a4 zVxtnP(Q;t_9E8{#(y<>FW7DfP@6;F_+#j+X*A43FvM7S2<*;6ATu;>2us&%Y?X>Oj z>9U(6>(1KbOfWkhpW}+0*5EhWaEV`w?aPm)=dYtIKAXJ?>@t7FbbOOSwZ?WvL*3LznEKhAYYDy)FTet&}{F6_yI(H*~=cBw%x1Zvw}4lsk;o zl?viFw65=FJry5JxaPZz2#o6~br35n6~u4oV(m|`=DIixiW?|%2&*a;#Bbb@`+gc~Vs@G2=4 z#Bb;#rBxB4-PC!hH3TYcPb!Gt(B;{kcoofF+5&vHQ_7%KPAZ7s(8akg!I`;G3G~8mS)!~VtD1fZ z>E2zMdy|?OtIh!L4!U>1Dkc@gZ|K78N?>MK!Y*Fp25G}pEm4X8rMWCS6PC>vg96=M zlr>nDk_zHCbW!d}P&QrG3v%Hy#8JjjRY|{mbnh<7j)Y{h_1OToh3*-s3P}a=8@eEO zCm@@wvj?|(C|8)OBNfDN=yHr1S584mUoH`BTPanLDkBxdZ|Gv&6+14UNtC+iCDiVv zOd+a@R1m+ROL1pHF>U2ipkdknxB*lV<7#-nwTSO!ok`N3KulSE7H0QRs_;}pDv00E zWw;|@m|Q>@WcO2=;8a2?h~LmfxIIDG_)kx0325E{kt{S-&@UU^yA`|=K9RPhukQU| lLU6P^Zx*jl1oQRzpga*&8h@A>Uzn>KyCTd?or!<= { 'fetch' => 0 }, + 'belongs_to' => { + 'fetch' => 1 + }, 'might_have' => { 'fetch' => 0 }, 'sets' => [ { - 'quantity' => 'all', - 'class' => 'CD' + 'class' => 'CD', + 'quantity' => 'all' } - ], - 'belongs_to' => { - 'fetch' => 1 - } + ] }; diff --git a/t/var/fixtures/excludes/_config_set b/t/var/fixtures/excludes/_config_set index adf1ab8..85b2e31 100644 --- a/t/var/fixtures/excludes/_config_set +++ b/t/var/fixtures/excludes/_config_set @@ -1,4 +1,7 @@ $VAR1 = { + 'might_have' => { + 'fetch' => 0 + }, 'belongs_to' => { 'fetch' => 0 }, @@ -8,26 +11,23 @@ $VAR1 = { 'class' => 'CD_to_Producer' }, { - 'quantity' => 'all', - 'class' => 'Artist' + 'class' => 'Producer', + 'quantity' => 'all' }, { - 'class' => 'Track', + 'class' => 'CD', 'quantity' => 'all' }, { 'quantity' => 'all', - 'class' => 'Producer' + 'class' => 'Artist' }, { - 'class' => 'CD', + 'class' => 'Track', 'quantity' => 'all' } ], 'has_many' => { 'fetch' => 0 - }, - 'might_have' => { - 'fetch' => 0 - } + } };