Commit a941d33

authored

Merge pull request #96 from mmuhasan/dev-where-bug-fix

Fix the where clause issue to solve issue #73

2 parents 4decdb5 + 7a1275f commit a941d33Copy full SHA for a941d33

File tree

2 files changed

+32

-12

lines changed

README.md
src/Syntax
- Where.php

2 files changed

+32

-12

lines changed

`‎README.md‎`

Lines changed: 24 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,8 @@ $query = $builder->select()`
`208`	`208`	`])`
`209`	`209`	`->where()`
`210`	`210`	`->greaterThan('user_id', 5)`
`211`		`- ->notLike('username', 'John');`
	`211`	`+ ->notLike('username', 'John')`
	`212`	`+ ->end();`
`212`	`213`
`213`	`214`	`echo $builder->writeFormatted($query);`
`214`	`215`	```
`@@ -242,7 +243,8 @@ $query = $builder->select()`
`242`	`243`	`->equals('user_id', 2)`
`243`	`244`	`->subWhere("OR")`
`244`	`245`	`->lessThan($column, 10)`
`245`		`- ->greaterThan('user_id', 100);`
	`246`	`+ ->greaterThan('user_id', 100)`
	`247`	`+ ->end();`
`246`	`248`
`247`	`249`	`echo $builder->writeFormatted($query);`
`248`	`250`	```
`@@ -297,7 +299,8 @@ $query = $builder->select()`
`297`	`299`	`$query`
`298`	`300`	`->where()`
`299`	`301`	`->greaterThan('user_id', 5)`
`300`		`- ->notLike('username', 'John');`
	`302`	`+ ->notLike('username', 'John')`
	`303`	`+ ->end();`
`301`	`304`
`302`	`305`	`$query`
`303`	`306`	`->orderBy('created_at', OrderBy::DESC);`
`@@ -456,7 +459,8 @@ $query = $builder->update()`
`456`	`459`	`'contact' => 'contact@nilportugues.com'`
`457`	`460`	`])`
`458`	`461`	`->where()`
`459`		`- ->equals('user_id', 1);`
	`462`	`+ ->equals('user_id', 1)`
	`463`	`+ ->end();`
`460`	`464`
`461`	`465`	`$sql = $builder->writeFormatted($query);`
`462`	`466`	`$values = $builder->getValues();`
`@@ -495,7 +499,8 @@ $query = $builder->update()`
`495`	`499`	`$query`
`496`	`500`	`->where()`
`497`	`501`	`->like('username', '%N')`
`498`		`- ->between('user_id', 1, 2000);`
	`502`	`+ ->between('user_id', 1, 2000)`
	`503`	`+ ->end();`
`499`	`504`
`500`	`505`	`$query`
`501`	`506`	`->orderBy('user_id', OrderBy::ASC)`
`@@ -561,7 +566,8 @@ $query = $builder->delete()`
`561`	`566`
`562`	`567`	`$query`
`563`	`568`	`->where()`
`564`		`- ->equals('user_id', 100);`
	`569`	`+ ->equals('user_id', 100)`
	`570`	`+ ->end();`
`565`	`571`
`566`	`572`	`$query`
`567`	`573`	`->limit(1);`
`@@ -593,7 +599,8 @@ $query = $builder->delete()`
`593`	`599`	`$query`
`594`	`600`	`->where()`
`595`	`601`	`->like('username', '%N')`
`596`		`- ->between('user_id', 1, 2000);`
	`602`	`+ ->between('user_id', 1, 2000)`
	`603`	`+ ->end();`
`597`	`604`
`598`	`605`	`$query`
`599`	`606`	`->orderBy('user_id', OrderBy::ASC)`
`@@ -809,7 +816,8 @@ $query = $builder->select()`
`809`	`816`	`->setTable('user')`
`810`	`817`	`->where('OR')`
`811`	`818`	`->equals('user_id', 1)`
`812`		`- ->like('name', '%N%');`
	`819`	`+ ->like('name', '%N%')`
	`820`	`+ ->end();`
`813`	`821`
`814`	`822`	`$sql = $builder->writeFormatted($query);`
`815`	`823`	`$values = $builder->getValues();`
`@@ -936,7 +944,8 @@ $query = $builder->select()`
`936`	`944`	`->setSelectAsColumn(array('user_role' => $selectRole))`
`937`	`945`	`->setSelectAsColumn(array($selectRole))`
`938`	`946`	`->where()`
`939`		`- ->equals('user_id', 4);`
	`947`	`+ ->equals('user_id', 4)`
	`948`	`+ ->end();`
`940`	`949`
`941`	`950`	`$sql = $builder->writeFormatted($query);`
`942`	`951`	`$values = $builder->getValues();`
`@@ -987,7 +996,8 @@ $query = $builder->select()`
`987`	`996`	`->setColumns(array('user_id', 'username'))`
`988`	`997`	`->setValueAsColumn('10', 'priority')`
`989`	`998`	`->where()`
`990`		`- ->equals('user_id', 1);`
	`999`	`+ ->equals('user_id', 1)`
	`1000`	`+ ->end();`
`991`	`1001`
`992`	`1002`	`$sql = $builder->writeFormatted($query);`
`993`	`1003`	`$values = $builder->getValues();`
`@@ -1021,7 +1031,8 @@ $query = $builder->select()`
`1021`	`1031`	`->setColumns(array('user_id', 'username'))`
`1022`	`1032`	`->setFunctionAsColumn('MAX', array('user_id'), 'max_id')`
`1023`	`1033`	`->where()`
`1024`		`- ->equals('user_id', 1);`
	`1034`	`+ ->equals('user_id', 1)`
	`1035`	`+ ->end();`
`1025`	`1036`
`1026`	`1037`	`$sql = $builder->writeFormatted($query);`
`1027`	`1038`	`$values = $builder->getValues();`
`@@ -1053,7 +1064,8 @@ $query = $builder->select()`
`1053`	`1064`	`->setColumns(array('user_id', 'username'))`
`1054`	`1065`	`->setFunctionAsColumn('CURRENT_TIMESTAMP', array(), 'server_time')`
`1055`	`1066`	`->where()`
`1056`		`- ->equals('user_id', 1);`
	`1067`	`+ ->equals('user_id', 1)`
	`1068`	`+ ->end();`
`1057`	`1069`
`1058`	`1070`	`$sql = $builder->writeFormatted($query);`
`1059`	`1071`	`$values = $builder->getValues();`

`‎src/Syntax/Where.php‎`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -635,4 +635,12 @@ public function getNull()`
`635`	`635`	`{`
`636`	`636`	`return $this->isNull;`
`637`	`637`	`}`
	`638`	`+`
	`639`	`+ /**`
	`640`	`+ * @return QueryInterface`
	`641`	`+ */`
	`642`	`+ public function end()`
	`643`	`+ {`
	`644`	`+ return $this->query;`
	`645`	`+ }`
`638`	`646`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a941d33

File tree

2 files changed

2 files changed

`‎README.md‎`

`‎src/Syntax/Where.php‎`

0 commit comments