Skip to content

Add joinWhere, joinOrWhere #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 207 commits into from
Closed

Add joinWhere, joinOrWhere #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
207 commits
Select commit Hold shift + click to select a range
9606848
Fix for with() and autoload()
avbdr Jun 13, 2015
9615354
New table() function. Improved dbObject manual
avbdr Jun 13, 2015
ccda4df
typo
avbdr Jun 13, 2015
4e7ae96
Readme updates
avbdr Jun 13, 2015
f3a7e61
Merge pull request #240 from avbdr/master
avbdr Jun 13, 2015
c4c0aa6
Fix name in composer
avbdr Jun 13, 2015
7a14d1b
Merge pull request #241 from avbdr/master
avbdr Jun 13, 2015
7ec9f66
Make prefix public
avbdr Jun 22, 2015
07078e0
Partical fix for a dbObject usage with setPrefix()
avbdr Jun 22, 2015
daa0198
Merge pull request #243 from avbdr/master
avbdr Jun 22, 2015
252724e
Partical fix for orderBy with setPrefix() and table specification bug
avbdr Jun 22, 2015
bc28639
Merge pull request #244 from avbdr/master
avbdr Jun 22, 2015
03e5d76
Fix for #245: correctly treat '0' values
avbdr Jun 23, 2015
a109005
Merge pull request #246 from avbdr/master
avbdr Jun 23, 2015
260c78f
Support for query options in INSERT
avbdr Jun 30, 2015
fc46ca6
Added replace() function
avbdr Jun 30, 2015
e0abe5b
Merge pull request #250 from avbdr/master
avbdr Jun 30, 2015
1a7a9c1
Fix description of a getValue () method
avbdr Jun 30, 2015
c9428d4
fix for out of memory bug
avbdr Jul 3, 2015
cf5fd70
dbObject: Make path proteced
avbdr Jul 7, 2015
6a3e247
dbObject: added JsonBuilder()
avbdr Jul 7, 2015
59cb2d4
mysqlidb: Added ArrayBuilder,ObjectBuilder and JsonBuilder to be cons…
avbdr Jul 7, 2015
1fe4359
Merge pull request #255 from avbdr/master
avbdr Jul 7, 2015
dedbb0b
Fix a typo
avbdr Jul 7, 2015
6d61f87
Merge pull request #256 from avbdr/master
avbdr Jul 7, 2015
2be9dac
new query option MYSQLI_NESTJOIN to join fields by joined table name
avbdr Jul 7, 2015
19b4a35
Expand testcase to cover error
avbdr Jul 7, 2015
fb611b6
Optimize with() handling by using joins. Fixed a bug with with() on m…
avbdr Jul 7, 2015
574943c
Merge pull request #257 from avbdr/master
avbdr Jul 7, 2015
9013d6e
dbObject: add primary key after insert() to the model
avbdr Jul 7, 2015
199cdbb
Cache relations results
avbdr Jul 10, 2015
b072103
Merge pull request #259 from avbdr/master
avbdr Jul 10, 2015
22017a4
remove query filter as it confusing and not really useful
avbdr Jul 18, 2015
dd69e99
Fix for a replace()
avbdr Jul 18, 2015
cdd185b
Merge pull request #264 from avbdr/master
avbdr Jul 18, 2015
ea35ad4
Do not connect to mysql in __construct
avbdr Jul 24, 2015
a8b8c8d
Allow prefix configuration out of constructor
avbdr Jul 24, 2015
493c188
Preparation for static mysqli
avbdr Jul 27, 2015
22b4515
Merge pull request #271 from avbdr/master
avbdr Jul 27, 2015
57cf446
Fix a typo
avbdr Jul 27, 2015
ba43d3b
Merge pull request #272 from avbdr/master
avbdr Jul 27, 2015
9cbabeb
Support for separate key definition in hasOne relation
avbdr Jul 27, 2015
25bf2fe
Merge pull request #273 from avbdr/master
avbdr Jul 27, 2015
5f89176
Code cleanup
avbdr Jul 28, 2015
93cd9d1
Merge pull request #274 from avbdr/master
avbdr Jul 28, 2015
2796093
Tag version 2.2
avbdr Jul 28, 2015
04cc2db
Merge pull request #275 from avbdr/master
avbdr Jul 28, 2015
35cc763
update readme
avbdr Aug 2, 2015
c28a3d2
Merge pull request #277 from avbdr/master
avbdr Aug 2, 2015
19abf86
add on dulplicate update
rongzhj1990 Aug 3, 2015
c4fd68c
fix rawQuery prototype and doc
avbdr Aug 3, 2015
3da5563
Merge pull request #280 from avbdr/master
avbdr Aug 3, 2015
75030a1
fixed _buildDuplicate() method unable to handle array arguments
rongzhj1990 Aug 3, 2015
d61612d
re-formatted code
rongzhj1990 Aug 3, 2015
4177849
Fix for MysqliDb usage with HHVM
avbdr Aug 4, 2015
f8d5b31
Merge pull request #283 from avbdr/master
avbdr Aug 4, 2015
20db85d
Merge pull request #281 from rongzhj1990/master
avbdr Aug 4, 2015
8e45c95
Trim whitespaces in the code
avbdr Aug 4, 2015
a590ab3
Expand onDuplicate test
avbdr Aug 4, 2015
bd30f30
OnDuplicate and Insert functions refactoring. BugFix for id field
avbdr Aug 4, 2015
16d88ae
Merge pull request #284 from avbdr/master
avbdr Aug 4, 2015
acd39d3
Fix for a onDuplicate testcase
avbdr Aug 4, 2015
5923bad
Changed inc() and dec() methods to support float
luke-j Aug 5, 2015
25baa59
Update MysqliDb.php
luke-j Aug 5, 2015
24a8a99
Merge pull request #286 from Luke-j/Luke-j-patch-1
avbdr Aug 5, 2015
0763046
adjustments in rawQuery readme
avbdr Aug 5, 2015
83c67af
Merge pull request #287 from avbdr/master
avbdr Aug 5, 2015
2dab030
documentation adjustments
avbdr Aug 5, 2015
fcc0204
Merge pull request #290 from avbdr/master
avbdr Aug 9, 2015
fa54e4d
Added getValue argument to fetch value from multiple rows
avbdr Aug 12, 2015
2bfb6ca
added rawQueryOne rawQueryValue()
avbdr Aug 12, 2015
031d510
Merge pull request #292 from avbdr/master
avbdr Aug 12, 2015
bc6ddff
bugfix do not add table prefix if table name contains a dot
avbdr Aug 12, 2015
9bbea7a
Added tableExists
avbdr Aug 12, 2015
00824c1
Merge pull request #293 from avbdr/master
avbdr Aug 12, 2015
08295f0
close() prepared statement when its not needed anymore
avbdr Aug 14, 2015
47461b1
Merge pull request #296 from avbdr/master
avbdr Aug 14, 2015
cf8ef87
Added @link
avbdr Aug 14, 2015
dded3a1
Swapped trigger_error for exceptions
dave-swift Aug 17, 2015
483efad
Removed closing PHP tag in class file
dave-swift Aug 17, 2015
8eea785
Merge pull request #298 from dave-swift/master
avbdr Aug 17, 2015
b5068c0
Merge branch 'master' of https://github.com/joshcam/PHP-MySQLi-Databa…
avbdr Aug 17, 2015
71d38c2
style fixes
avbdr Aug 17, 2015
dad6618
Merge pull request #299 from avbdr/master
avbdr Aug 17, 2015
239730f
Fix getValue for NULL values
avbdr Aug 26, 2015
df1b0b9
Merge pull request #305 from avbdr/master
avbdr Aug 26, 2015
28360fb
bug fixed when using nestedJoin
Aug 27, 2015
b83e8a2
version changed
Aug 28, 2015
acaf0d1
Merge pull request #306 from oolso/master
avbdr Aug 29, 2015
ab1f535
onDuplicate() should return this
avbdr Aug 31, 2015
e4b060d
Support for FOR UPDATE and LOCK IN SHARE MODE in selects
avbdr Aug 31, 2015
dce7544
Merge pull request #309 from avbdr/master
avbdr Aug 31, 2015
09f36df
Support join in delete()
avbdr Aug 31, 2015
525dc21
Correctly handle mysql connection errors
avbdr Aug 31, 2015
2bfea28
Merge pull request #310 from avbdr/master
avbdr Aug 31, 2015
c5707a6
Fix a typo
avbdr Sep 3, 2015
8041c0f
Merge pull request #314 from avbdr/master
avbdr Sep 3, 2015
a6d5f13
Added * as a valid char for orderBy and groupBy
avbdr Sep 6, 2015
70a3686
Merge pull request #318 from avbdr/master
avbdr Sep 6, 2015
fbd3093
Update readme.md
rjpounder Sep 8, 2015
1ecb5df
Merge pull request #319 from rjpounder/patch-1
avbdr Sep 9, 2015
90ab25d
Close connection on __destruct
avbdr Sep 15, 2015
d13a353
Update MysqliDb.php
leolovenet Sep 17, 2015
5497e0d
Merge pull request #326 from leolovenet/dev-leolovenet
avbdr Sep 17, 2015
e0153d7
Merge pull request #323 from avbdr/master
avbdr Sep 19, 2015
9ad5d97
get rid of FILTER_SANITIZE_STRING everywhere
avbdr Sep 24, 2015
ef82577
Make get* protected to allow overloads
avbdr Sep 24, 2015
62ad414
Make count protected. handle empty result
avbdr Sep 25, 2015
44f3bcf
made ArrayBuilder(), ObjectBuilder(), JsonBuilder private to be able …
avbdr Sep 25, 2015
12c0a1d
dbObject: Add double as a type
avbdr Sep 28, 2015
bf23579
Merge pull request #332 from avbdr/master
avbdr Sep 28, 2015
8d53d6a
Allow " and ' chars in orderBy
avbdr Oct 2, 2015
fe8fb79
Merge pull request #336 from avbdr/master
avbdr Oct 2, 2015
5f94797
Fix a typo. added jsonbuilder test
avbdr Oct 3, 2015
531957a
Merge pull request #337 from avbdr/master
avbdr Oct 3, 2015
8218443
fix a typo in manual
avbdr Oct 15, 2015
44c8895
fix couple typos
avbdr Oct 15, 2015
b626255
Merge pull request #341 from avbdr/master
avbdr Oct 15, 2015
b432a89
Update readme.md
saleehk Oct 21, 2015
ec0feac
Merge pull request #345 from saleeh93/patch-1
avbdr Oct 21, 2015
4b1dd0d
issue #344 fix for onDuplicate.
avbdr Oct 22, 2015
e4353be
Added Map() to transform result
avbdr Oct 22, 2015
1e79753
Merge pull request #346 from avbdr/master
avbdr Oct 22, 2015
386276f
Improved the documentation
JustinEldracher Oct 27, 2015
2e6ea96
Improved the documentation
JustinEldracher Oct 27, 2015
23f6f77
Merge pull request #347 from JustinEldracher/master
avbdr Oct 27, 2015
8abb2a2
added having support
avbdr Oct 28, 2015
d4120c6
remove debug
avbdr Oct 28, 2015
e4746f8
Merge pull request #349 from avbdr/master
avbdr Oct 28, 2015
3cd0b3e
replacePlaceHolders: return string as is if no $vals is empty
avbdr Oct 31, 2015
246e275
dbobject: fix for pagination function
avbdr Nov 8, 2015
2148713
Merge pull request #353 from avbdr/master
avbdr Nov 8, 2015
4f5561b
update version to 2.5
avbdr Nov 8, 2015
5bf7f09
Merge pull request #354 from avbdr/master
avbdr Nov 8, 2015
0119c46
changed version to 2.6-master
avbdr Nov 8, 2015
2ea6170
Merge branch 'master' of https://github.com/joshcam/PHP-MySQLi-Databa…
avbdr Nov 8, 2015
e6189a9
Merge pull request #355 from avbdr/master
avbdr Nov 8, 2015
1c46e23
- Some small refactoring to comply PSR 1 & 2 standard
Nov 11, 2015
6cd7b5e
Merge pull request #357 from tommyknocker/master
avbdr Nov 11, 2015
c692658
PHP DocBlock update. Some small PSR-2 code refactoring.
Nov 11, 2015
d547858
Merge pull request #358 from tommyknocker/master
avbdr Nov 11, 2015
7d08fbc
added paginate() to mysqlidb
avbdr Nov 15, 2015
f87a281
Merge pull request #359 from avbdr/master
avbdr Nov 15, 2015
1353bd2
paginate: replace round() with ceil()
avbdr Nov 16, 2015
c0e3575
Merge pull request #361 from avbdr/master
avbdr Nov 16, 2015
10610b2
Deleted condition "or" method _buildJoin()
Nov 24, 2015
8cffc84
Added check condition
Nov 24, 2015
b02ed32
Merge pull request #366 from KpuTuK/patch-1
avbdr Nov 24, 2015
549494d
fix a typo
avbdr Nov 24, 2015
5b3c0ce
Merge pull request #368 from avbdr/master
avbdr Nov 24, 2015
38e00c4
Add limit support to update
avbdr Nov 24, 2015
555fcb7
update readme on update() limit
avbdr Nov 25, 2015
1853907
Merge pull request #369 from avbdr/master
avbdr Nov 25, 2015
fba2cdd
Fix Foreach Parameters
asithade Nov 30, 2015
949996f
Merge pull request #371 from asithade/patch-1
avbdr Nov 30, 2015
3976dcd
Fixed Having
g4ther Dec 20, 2015
e2d4ef4
issue #380. reset object before exception in _prepareQuery.
avbdr Dec 20, 2015
00a6b47
Merge pull request #383 from avbdr/master
avbdr Dec 20, 2015
1502514
Obvious fix
avbdr Dec 20, 2015
e29e28e
Merge pull request #385 from avbdr/master
avbdr Dec 20, 2015
151ef44
Merge pull request #386 from g4ther/master
avbdr Dec 20, 2015
6c0ed98
issue #388 dont share mysqli between copy'ed in subquery
avbdr Dec 27, 2015
873077a
update copy() test
avbdr Dec 27, 2015
ee17b70
Merge pull request #389 from avbdr/master
avbdr Dec 27, 2015
148302e
Solve Bug in join to table without primaryKey
KTP95 Dec 29, 2015
5e7b333
Update dbObject.php
KTP95 Dec 30, 2015
be8b612
add escape() mention in the readme
avbdr Dec 31, 2015
3c8898c
Merge pull request #392 from KTP95/master
avbdr Jan 1, 2016
b921c9e
fix $obj->anotherRelatedObj === null when not exists
KTP95 Jan 1, 2016
c0ac21d
fix $obj->anotherRelatedObj === null when not exists
KTP95 Jan 1, 2016
f889dbc
Fix insert() for empty values array
avbdr Jan 1, 2016
89398eb
Merge branch 'master' of https://github.com/joshcam/PHP-MySQLi-Databa…
avbdr Jan 1, 2016
8593b70
Merge pull request #396 from avbdr/master
avbdr Jan 1, 2016
2012533
Merge pull request #397 from avbdr/master
avbdr Jan 1, 2016
45f9d83
Merge pull request #395 from KTP95/patch-1
avbdr Jan 1, 2016
44ded71
fix a typo
avbdr Jan 1, 2016
bd2ffbb
Merge pull request #398 from avbdr/master
avbdr Jan 1, 2016
5fd2d73
commit() and rollback() methods should return results #41
avbdr Jan 9, 2016
3853553
Merge pull request #412 from avbdr/master
avbdr Jan 9, 2016
2878808
update readme on correct null checks
avbdr Jan 9, 2016
7b250d8
Merge pull request #413 from avbdr/master
avbdr Jan 9, 2016
60b7054
issue #375. onDuplicate returns false when there was no change in data
avbdr Jan 11, 2016
b3754d2
Merge pull request #415 from avbdr/master
avbdr Jan 11, 2016
120efb6
Update readme.md
jefvhal Jan 16, 2016
f724dff
Merge pull request #421 from jefvhal/patch-1
avbdr Jan 16, 2016
a5dc36c
fix for #427 dont enclose fields into `` if it has a relation
avbdr Jan 24, 2016
0890ad9
adding support for error codes
Jan 28, 2016
fb85c70
Merge branch 'master' of https://github.com/joshcam/PHP-MySQLi-Databa…
avbdr Mar 7, 2016
bbb7b8b
fixed missing space before operator when comparing against IS
ricwein Mar 13, 2016
95b27c5
Merge pull request #457 from ricwein/master
avbdr Mar 13, 2016
de1cc32
Typos
Apr 22, 2016
631decd
Remove unwanted comment lines
Apr 22, 2016
a4ebb98
Adding error helper functions
Apr 22, 2016
a62e491
Merge pull request #466 from Ettemlevest/master
avbdr Apr 22, 2016
6a63f6c
dbObject: Do not prefix join object with a table name with it already…
avbdr Apr 24, 2016
19acbee
Allow space in orderBy()
avbdr Apr 24, 2016
5bcbc49
Merge branch 'master' of https://github.com/joshcam/PHP-MySQLi-Databa…
avbdr Apr 24, 2016
ff09f83
dbObject: do not add table name in join() if table name already speci…
avbdr May 10, 2016
3df726d
Merge pull request #472 from avbdr/master
avbdr May 10, 2016
e3c63d0
reword prepere() error. Fix for tableExists. Bump for 2.6 release
avbdr May 10, 2016
1b9bad8
Merge pull request #473 from avbdr/master
avbdr May 10, 2016
da2ff3d
bump version after release
avbdr May 10, 2016
ef3d5bc
added donation note
avbdr May 11, 2016
ba65d15
Merge pull request #475 from avbdr/master
avbdr May 11, 2016
17353cb
updated paypal
avbdr May 21, 2016
51550ae
paypal url update
avbdr May 21, 2016
b145912
Merge pull request #477 from avbdr/master
avbdr May 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
tests/ export-ignore
index.php export-ignore
Loading