From cc033e2165b9a004375a856228f7e7d5dedbea25 Mon Sep 17 00:00:00 2001 From: Eric Allen Date: Wed, 4 Nov 2009 22:31:17 -0500 Subject: [PATCH] Conflicts: db/tracks-17-blank.db --- app/models/dependency.rb | 6 ++---- .../20090516000646_add_todo_dependencies.rb | 2 +- db/tracks-17-blank.db | Bin 46080 -> 55296 bytes 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/models/dependency.rb b/app/models/dependency.rb index 53c73f65..dd347c1f 100644 --- a/app/models/dependency.rb +++ b/app/models/dependency.rb @@ -1,9 +1,7 @@ class Dependency < ActiveRecord::Base - belongs_to :todo, - :class_name => "Todo", :foreign_key => "todo_id" - belongs_to :predecessor, - :class_name => "Todo", :foreign_key => "predecessor_id" + belongs_to :predecessor, :foreign_key => 'predecessor_id', :class_name => 'Todo' + belongs_to :successor, :foreign_key => 'successor_id', :class_name => 'Todo' end diff --git a/db/migrate/20090516000646_add_todo_dependencies.rb b/db/migrate/20090516000646_add_todo_dependencies.rb index 769343f2..2ca58dae 100644 --- a/db/migrate/20090516000646_add_todo_dependencies.rb +++ b/db/migrate/20090516000646_add_todo_dependencies.rb @@ -1,7 +1,7 @@ class AddTodoDependencies < ActiveRecord::Migration def self.up create_table :dependencies do |t| - t.integer :todo_id, :null => false + t.integer :successor_id, :null => false t.integer :predecessor_id, :null => false t.string :relationship_type end diff --git a/db/tracks-17-blank.db b/db/tracks-17-blank.db index 941c0958742f7b1e7be50c6fc27ea6b54f61d1d4..fdbc4ca62cbcf091127d39d5e7c25dfbb10f471c 100644 GIT binary patch literal 55296 zcmeHwYiwgzejo2W)M$pDv1a^|$M&pgjc0AGJ)ZmECB)LeMn%0~+xa@>BBXb*O8&(w6g?a?~zR>^Fs#d6d7xn{l7GTUwQoqDtQPN(A8Yp>U9M!mLoC-S!cj^V!( z_20=~%5am)C8+EHa)*sf& zQrR%f8cG68M-P|Z=$L40*D@b~hH6yNDzmDVtr6UkqB!tAZ`zEtxoPe-%~t6FH6EBv zt==+sRlQxV*LDrFr8moscD;##I|a(#SOrc{J`Skua@E}J)oTF7o>}8v?UTUiItP{Q zqP^|9QQrlfpo|B!wq0&p=I+G#JYK7l;>PN(*0nNK?vU! zl)GZUFNybs@O>dTA&BY!{P#WNmvM1FE&`up1di|US3R>||N4x_bIbE}S*w?trlHER z77XtxN>Ecmx)u~P!4$=i6cUV}wr4CTa!3<&Z6TxzAvG8dnVPYusbOtFR)dnJ1cQ63 z7*sV$mI9irhW4OlsG8a`Wo;p-=#mi%nu@p=l#B%t1t_6CEhL!Ao*vc=%?wL{K1~Mi z3Zh?1;U~%${{@{gcsU& zGb#OhxqBY&9{&pe`y~E39{xwswc~wmdUke}`%uOx!xE{3+p-J4xV;=nE&EfE==!ps z1^M5cquO0OnOcr5Z~Ncdj&DS^^ZvEvyi-kt@z-=}fzCKv+jS_3&SlXLH8tZHeW)}>FmVGB zSyRUW@AT~R&)Z-@0K*6_wl0m8PeU$Na80eAWgI=yF=q1Llk<3T{OY415W9>It5b|n zej&`jr#Q9PWqJ${7IZO0ta`Cr8`+Bs@I*Mg6?(JVptHH5wpxevCg{$dR@7zTNZ77d zOh++e2H*hMa%-0{-3J<$d*vo{tp^X4rCunR+G&?|+ug=l1OJB2w8w1IdIO$`va#D~ zp5-_gbgOArP3CO500iS{cg>?l86JhR`N{l;$|c4tKKkl_*!rFp+d1GH8+AMMVgo+` zU&nYh>a8;MUrcazz|`*3=g7t$GC`4gxCR~%mU|K#1qHXAgW+_3QLo8?IW`iHgzK_) z?WrBBJ;_HfY`@I}Y`@vrL*porvY!!Q(5XLvjr?=i|3wce;^KZ>1Y86@4FpoKJR%%- z?WQbyJl7(I;Wte1Z8(+nvf1*t>;6{apArcxG#tM{=aW~$hSX@Zo6f=2)GD54g~&!!d><} z&&_bMyjriC+#Ww9_A}|9dIg#N@A-zu^9}A-_-o`h9!FbG*73o!(@b~#u*-BudzH<; zKQ*R1+M%Dm?ubP{D1Q^ymL8;6J`z1}{{73-v-j?C$2S-#Exm-b!QE=P*i@;y+d36+ zZ49QlQ}J^^3`>60gdf)dht|>jhhMtFjJA(nW_7aVE_Qi(ylfUm%R9@z5lN>u<4I)N zSWaR=d9zN@gyXzN-LPCJg~Cse=)<9U?T@MD-aF=h_Wy z^>eRTua1>R9-x8CCN{VDOj zg{}L$E%W^j^JAJ z{x$h+@-6aPm*CI$QoHD?~?mOAp&`e z+##=$o8(z?jZ71c|0(}t{*O?B`*9I?90*(&_<1V&1Vs!Af)ES@uiqPl$bu*;flxs4 zzQf-L1ig20RlING8t}e_tL*&>u99~iSJC?>u7dXs{)Qa(ewn`^DdY}6Ba_$pnFVs2 zpHavhKO=fy<8O$9*N^z1_f@0~dB22^u=f_OA@3`=%HEd|D|%l-Y`}XH-vi`DekSCd zMWpC`0l|v*d0Zv$bBGLkpGCOjeFh<-_Xa{F?{!=SGQ-bE-lq{6^j|{7leG5EtszW7_6Up9Y4=;FJF^AGUs^}7cRoK!iW!6ouvE10zZ@-^Sjd*08X?<%sen zo?4n1=Ut9_ZPZyiQ%CEb$|H`N8D^$p=)M%3(56vj>eADAaxCm{}~0Y}_(cNdb5By9hj)2vGXx zJiq6m|36osk6wRjn)*t9@vkvw$+)kjb>ipsF=xr#iP(?j={nbg^tjw$=lP^2EMOyf zv%P!Dvjz3Mg&p_fUPHL35YBehkGa7H4|LS`cI!IaTg)>xT$@LxQ7G28J2h-jvY$P% zANUZE3Jocmh;w@T5Ipp};b{e{jh#V*yoef&8TRLw>y8Z|)KfT2K-&YC88r~A{EP*f*>A@ zhZ#Im*phli-}{lzT?nUs+K+`0-5(6$Uu_Hlajwca`*{K#c=S$4>0!qC)=t^_pKJe5;&^VDi@@g}0V@A_@+ThhLtNaCi-3#3=MaIX_$e$G zK2Nw5PB3^1&k5rP$9~YG0D1CHJ>>UsaX&5sE&@*g0^!pEeHbd%*=Q5L667HTQI`Pyat+`~RMRj=N2C z5pWUsga}L#j^lZHS;E*78{^w=SM;`qDE*Iwh zKJVjuWQueiZ%0x$F3pP1bMHGmukhW{MQ8SOJ^lXTB!8zf5%Y4=0Jt~VBjfX5d*;%t zGRt)xrBc5qE0&!mz<#|nso?Q+tY{X5vis){%vYYBo_%+gJHF;9ojrp>8$EiCg$2Dl zsfr1SSv@Qq^^D4xo7bM3o(-ciZc=5mVQ_P^e6O5a(;($oHFns1?Rj(v?r&#@25n%7 z4HDWxw*_m2Z`dY+Fjzc4+!g$nOEIyIqyU98KnSzyO~>4G&6GqV2LxgAZw z3PFFO)Mih2-G0u@(G@%B)kzJoBOU2ky>_^x-udIpFP`qYozPLhum^UW|AI9SGoICi zVb}ZmKhFR9bK;)=^>~?{Tbql(V@2Q!cKxzL&v^Qc9dX0-e|P=wu?~Y%;zW*QHyu@=p@@Js`?|8^}@WuVO z2)GD5(FpjxT!iD#K46eX?`Amuy}?<5gZ00kVEzAz?zY=_7XcT6heCj90R#H~G0y*Z zsLXC+7XcT6ClrAhpBLMId3H{yk9_EvBAO3p{58n05{>*{@?ZP^p3u&@&2|xZtO$UB zu5+Wa(YO=8`D)chf%Pd)hR-rZG*v<>?3Ei?gKZv7A%RoXB>WzPUSO z7e%-5L9I9FD^BoIBZ7x{o*q<+WX@8(W2IiE&;Lw&{*nj({}*@2{RyAuzef%c_=rBo z+|B9P4QyR`%dyLY9X)h%p94Fqg2lWxX_v#Iu`A^Q&oCZvm2rSe6Y2lo5%%v>Yp7eW zi-3#3BS&CF{~V)#j?q8I=$~Ws&rPKNQ~LiuBkbQJZ=hSCi-3#3BSK(Y|K|q!KR3|- zxq<%A4fKCT`IGg3+8)Xm+>eWZi@+BS0eAoZ7jDSi4!Z~p5$Hev>z@BN1jPN~BJjCG z;OZ1R@QL2MAw(`s#nMR)j!sm(yfk;bGch}dbY;IW3h3fvSFT|q-k3H!_Z6R#)LD( z=Z~jvPtSf8FZu1Cfq}Qx;a#q~r(WHAD&X#*ujyobE4}O=oIib5_WpA8sX{0!_6vdM zt8-|`iPJxDmKgdMu>lZUOe=NQ>JzGJ2s9<>5 z_K5=Q6TR7bKaFE2eA9!w?SyY#pc!YEGO=}b^11%;;iEdy=57Dw*<>f;5R{M|pvoUZcQusDEr_5#z``IF_F@5}!`rSJdy)6W{=yX|oi za1nS^2(V4ReGPzp?aTi@{k!LXJ}Q*ma$E#H>j==j0G#9ePl5k+dj9VZ$@j@0lmCw0 z|KB0sCjW|ji~J_}4e}58-{gOt{2lVQ$uE&#B;O!^g&dGNDd9iuvOq-g z6>^)rLS7&<L;7 z$#>`vDf}F}EnH!@&^2}o`q@qSGP?zCvYX7an{H3e-~ffkBfkdz>|x> z^b~!+hvyRZ1oXd5Pm}(ascH5e5YOf5Y4#2f&lFwx7g9nvAr%^0)#|CSOeN8+6wSkW zF}@h-|HYCAT5Y?eW)(}XWLkx+P<(GED)`ix)myJ+4%Zg-PF@OkjMxea$#hY`+A#BC zRL~@&ro}Spd@fNds@7Ela5;XT(nn6E0(#s9nH(z4YYCtg$w9=4TaZzYHp(yKV3`6S&I=1S2V#A z3R$tYUS;6X0+-Ndy9NYG?M5LjmbB^$K#6yB^m9uJAE=Vm@5ZQQWg}~~e1&B@lTy;M z>ADkfhQ&^WwybMp(_?+!+j90fmTBoy+BrPuG(8j0V=Eohd^R8t!h@lG79i*0k(Z7v zA7;#wCWV_S`a51oLR7Oy6&tWrb){X{DPagllgdYD)!NS3R17f>}U)>%?#ABj`LJkT`cwyu!C5po$hNqj)((p`I?=?cc_)55k(zlMQ3l0=0#kzCtz-PIMzpw1U!frI5+& z?4;56T=W364QeaalBq3aV?W(ZX5#^TKgw6ry<~Mm_9e54>Sn6aD`dCi|`@v4F@)>$(D-m@#5-+4^5Nf z%Pa5abHz@&nmIDEnVzv&68bEvP|{X2)>)|gKryY4i@Hzm)oVF9d0^xc`-MzcQnMNP zy&UB%3$;^dJCLS8`#vtx6lmWAkY>|27AqX+RiRVJZa0jTFq;QCsc_&!U^&t{j1H#d zLB5u>^jg7MTQqt`HqlmdTQvYyHL}XS5wi}oa>+8-_*aTP^RUsNEI7V1K-lKpQbIJq z9JR7?sL7aBF-t1!=#6zqmW;GQe}kKJiw%%v(d<&muzir0qmUX9E#*iU{HqR*(g9nR zwQ{kRuVn;G%g%Z&dZ0@dL{6??K^lY@3yy_TI!dG>XF!gET??%QGY!&3FK%TUC38{P z@fC6_VgbyYGICl=K1&%pNQ7a1_ELdBv1$1_LQ_jjE{-Q zLx>bK4~$>lKG0W;5;zHP(CceC0en0P`30T^?&8yH8^P^rxU20bJxI$2m_x&?Qie!5 zN~O5gjnop=6%oHJ$mvENK$#gj)@{qD?F(!gg4n?wx2;SjkpS0h>p+z<0IL6U{Es~N z?|xhaz7Pm}aD}_%+4%6T{GhjEMI)uqVyeEQ){=YqYNnpgK}&{o)#cXeX7T6%;<*8u z@0o{saIu;!<)xCfu~g52+)F-vHQE9hmI}3POSi%$st{zB>T7xpDs(QXMHb^5Mh;xp z3O5R|%4)nQb~K5qTvpd-?!;F$DNtUl7NCpSUdb0s{$dR{Ci+ z_Zu-Sw$k&d%cYVol|qq7KDbzkicl>p=3(TkKI%ugD=2rx1-~TS7sdO6I2dqxm_QJJ z0{-sdPsX2uzjyE#=yS=n)uA%e@R`y|OOKUGX(`-=aPEPr9XfgM-p)zoq+ZMCGLXla zjt^pBAKXsKf%BTQz8c9|)%YUQE31$_i8jPzRIjFsW;QIwSCh~e z(?#&zlCc<7G#THe6{tuMY~3jIu!KMb8V1|)fum!<8Wu!CFCI%MEMh0xF|uMAgILt0 zJPKOrsq)6X_zIIxD9mbUP)s4XqAdt3Ymmt@VR%tlTCi)0g}VT*yI$5ITBD&wSZlh} z?$Ocl8H*#iYUCo!z`~Sj>LOJY6V$jGGXX{_ab#dCt&U3TkM&B|a0;wcYi*MLg_>>k zpwum7^N?!ok}g}&D@(vafy%TIG*%O00h6VWgOawA+}Eqtp|QFV^w|+e*q;osj8I55 zoC*mv_JKgpwV{mDE+r52+E&N+Ael-YAU#Uj4+L$uRc&ZPsPQJ{Y-gtDJ^Vd6BcM_KiSKa3;Pwtw*lUf z?B$h>*s_>RCHM2$t;6Jgk&)J>*jkO3N>$7vnD3biXqp-k6-^AYFkig5z7c_?L6t2{ zN>J?u`e3o9%bBv4wU`Ox)RQm?D8V=4tF1Mkn#~v27ME?qsiMh72YoEVbb)FU=s<(% zQJu-4gubIRbaA9Z`JiCZQb1C)IYVWO`7M}DaE`|6qbe(u#}nEqWpbw`e(~hQhcV%> zJZ$z-J}iP`_Dm>Y>S_XpR9J+$CO{NWs|1SmN-HfTyI?UX0;%KV=@hv@@C(_(rlPut5BfFbYo49=HPAV`!N=+Fls%7`3gq@s4AD} z`5;7?p#WLYRkJHCHP@hS2s(6)pRE}aUlqX6`V4%;zgwW93hdnhXCFoM8G9Ty4osXj z9iH_pSWPS)v}aws7+;UTm*p_iGlzxP3V?{$6O=E-GCgWtC%V)$hxG0O`4ha$cOLVy zc^AY9o%3vnHp@mCg<(<&H6P%2j_m;)1k~C((5Pq!v!@K;3t)hWxoiI}ML?&jn3tLhoUFt**!j(hoFdtkM zqHRolxH{qH$;k$+($XH7%6?9Q`T;ARnuOc?57zo%2A@{@9;EdxQl44PcR=cJ9PNk> zmsPx&hlNL(Ob!+tysSa^z+la_$`Lbpz9kE$Vig`4lW`cIR8YcD-_s>c;7rB69r%nE^{TDpP15mv=PP+>Ve`V0=z|p=D*QLzcx1CfO^9$> zTy%Dn$5r>uQsRB6Q{_SynqbwUzMvkP9ZOJ)fdt&=$xyUcU&~7?`)VwGxLGow5v?5R zu_GlXtyHQ14tKb(O6kpF144rk1j|Dz#i`K%oj-=sBGk$#thOQ}{XguNob0z4E)6^{V5*TC)d753SM2L4VEjf`93_Yh zoxpIS9F@Rj4Uarc#(+}V4-8Y2I%7@y|(SFB}4(52nA060i|@uIm<=p-*=J$T#)`{ z(7y!oSI%+m`)uF-1zh{59L_$c$N6C$&al--9_NR3IQyI)=ZAGTQ!X|1I6thz8MgY! z<20-W`S2k0SR!h3HnTnQ@sdNuAv$C<24>0Q)Gy}R>vjxnEZVnsgNS^xs zDbbc{^nf;7=fL`KE9$i4GP!6a5A{sP3IvmbxeX>r)*ZG1^?*Ilo;zXAVJV9)vTQfN z9|Q0|fSJ<8k{xQ-Io9@I*V?vT-&22t^}Y0PL4jtbtB8X&E-Tb;dZt=ns+a=NWz?}8 fSyNZ3{%@Nzl~4jA9_xD|{415V23OH~wbc0kCdZAl delta 477 zcmYjNJ4ho@6n*dBo0v7O_=BLBF{D_P_?c0Ih$%#2*;t7Py3IOK6pLt(6p0p+fg!pe z==dzePDO&niuzb&8y75gLDTcX zl85j`EhT0$X7Ww=i2E#M8MC&-Y#MgD+BF-UnkH}B6khO43IRD!89QYsmhsa~>27zC zClKJv&GM$F7ClWqe|##I7>z^|k-50vHx`RUCn7WQsn1ceLmMthQ@J90RYCf=C?2bm zX?+3n!dtu=zBtNxlJO+Z!3sR$G|n>JGWtbg@w?E?6{(v`aI`^%uKbl{PBzJ)61FkG zM_HClTE?JU*xl#yF74qWkh#du5Okn?#&tAs9^)9r3H*k`IDld7#SjLu1?$m=)mVXU zBzS;($if|5!zG-oW*xh&%uQ