[sfPropelFinderPlugin] Some mistakes in the API

I have to complete this ticket by a last error... Not a minor one this time !

Code:

    $users = sfPropelFinder::from('User')
      ->whereLogin( $this->getRequestParameter('findme') )
      ->addOr( UserPeer::EMAIL, $this->getRequestParameter('findme') )
      ->find();

SQL query executed :

SELECT [... fields for select, no problem...] FROM user WHERE user.LOGIN='julien' AND user.EMAIL='julien'

SQL query expected ;

SELECT [... fields for select, no problem...] FROM user WHERE user.LOGIN='julien' OR user.EMAIL='julien'

Am I correctly using addOr ?

I can't reproduce error 1, nor the more serious one... Could you try from a SVN checkout? Maybe the package wasn't properly done.

As for the XXXFinder, this will only work if you create the class before... The doc probably doesn't state it clearly enough.

Ok, I checked out the plugin from subversion...

So : ERROR 1 : The methods _or and _and now exist, OK

ERROR 2 : Well, you right, I missunderstood the documentation... I maybe read it too quick, OK

ERROR 3 : Still not working But it's a bit wierd... I put here some test cases, their results and what I expected...

//! configure it to fit your actual model
$class = 'Formation';   // formation
$a = 'Title';     // formation.TITLE
$b = 'Slug';      // formation.SLUG


//! Test strat here :
var_dump( sfPropelFinder::from($class)->where($a,'foo')->_or($a,'bar')->getCriteria()->toString() );
// SELECT  FROM formation WHERE (formation.TITLE=? OR formation.TITLE=?)
// OK

var_dump( sfPropelFinder::from($class)->where($a,'foo')->_or($b,'bar')->getCriteria()->toString() );
// SELECT  FROM formation WHERE formation.TITLE=? AND formation.SLUG=?
// FAILED... Expected :
// SELECT  FROM formation WHERE formation.TITLE=? OR formation.SLUG=?

var_dump( sfPropelFinder::from($class)->where($a,'foo')->_and($b,'bar')->_or($b,'stuff')->getCriteria()->toString() );
// SELECT  FROM formation WHERE formation.TITLE=? AND (formation.SLUG=? OR formation.SLUG=?)
// OK

var_dump( sfPropelFinder::from($class)->where($a,'foo')->_and($a,'bar')->_or($b,'stuff')->getCriteria()->toString() );
// SELECT  FROM formation WHERE (formation.TITLE=? AND formation.TITLE=?) AND formation.SLUG=?
// FAILED... Expected :
// SELECT  FROM formation WHERE formation.TITLE=? AND (formation.TITLE=? OR formation.SLUG=?)

var_dump( sfPropelFinder::from($class)->where($a,'foo')->_and($b,'bar')->_or($a,'stuff')->getCriteria()->toString() );
// SELECT  FROM formation WHERE (formation.TITLE=? OR formation.TITLE=?) AND formation.SLUG=?
// FAILED... Expected :
// SELECT  FROM formation WHERE formation.TITLE=? AND (formation.SLUG=? OR formation.TITLE=?)

var_dump( sfPropelFinder::from($class)->where($a,'foo')->_and($a,'bar')->_or($a,'stuff')->getCriteria()->toString() );
// SELECT  FROM formation WHERE ((formation.TITLE=? AND formation.TITLE=?) OR formation.TITLE=?)
// FAILED... Expected :
// SELECT  FROM formation WHERE formation.TITLE=? AND (formation.TITLE=? OR formation.TITLE=?)

var_dump( sfPropelFinder::from($class)->where($a,'foo')->_or($a,'bar')->_and($a,'stuff')->_or($a,'smurf')->getCriteria()->toString() );
// SELECT  FROM formation WHERE (((formation.TITLE=? OR formation.TITLE=?) AND formation.TITLE=?) OR formation.TITLE=?)
// FAILED... Expected :
// SELECT  FROM formation WHERE formation.TITLE=? OR (formation.TITLE=? AND (formation.TITLE=? OR formation.TITLE=?))

Hm, this seems to be a Propel bug... http://propel.phpdb.org/trac/ticket/170

Ill try to update the internals of my _or() from an addOr() to a Criterion addition.

Hi,

It's not really a bug, but a (boring) way of dealing with criteria / criterion in propel...

I made the fix in sfPropelFinder.php (cf. attached files) I let you check it, read my comments (marked by 'JG'), change them if...

and let me now !

Bye

Oops... small bug

I get your point. Could you include a diff in GNU diff format, and include in it the unit tests to prove that the condition addition works as expected?

OK

I add 7 tests

Note: the next improvements with this _or _and methods should be to be able to do such queries : select x from y where (a=1 or b=2) and (c=3 or d=4) select x from y where (a=1 and b=2) or (c=3 and d=4)

With this kind of syntax : $finder_a = sfPropelFinder::from('y')->whereA(1)->_orB(2); $finder_b = sfPropelFinder::from('y')->whereC(3)->_orD(4); $finder = sfPropelFinder::from('y')->where($finder_a)->_and($finder_b);

$finder_a = sfPropelFinder::from('y')->whereA(1)->_andB(2); $finder_b = sfPropelFinder::from('y')->whereC(3)->_andD(4); $finder = sfPropelFinder::from('y')->where($finder_a)->_or($finder_b);

in r8370

Thanks for the patch. I also added the magic handling of andXXX() and orXXX().