Skip to content
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.

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

3.4.2 #13626

Merged
merged 82 commits into from
Dec 2, 2018
Merged

3.4.2 #13626

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
3bbb69c
Explicitly define nullable columns
1RV34 Sep 29, 2017
ac5df9d
Update MySQL tests
1RV34 Sep 29, 2017
fdbc929
Update PostgreSQL tests
1RV34 Sep 29, 2017
de04796
Fix issue with validation on locales where comma used (#13457)
mervick Aug 15, 2018
0786f7c
Removed configure.ac
sergeyklay Aug 15, 2018
4b52697
Bump version
sergeyklay Aug 15, 2018
7bbab24
Removed no longer used local variable from router.zep
sergeyklay Aug 15, 2018
b344a2c
Unset params["parameters"]
crnjakovic Sep 2, 2018
0281e81
[#13492] Added @deprecated in the docblocks for total_items and getPa…
niden Sep 19, 2018
59b1ec7
[#13492] Changes to the paginator; Added one more property, added pag…
niden Sep 19, 2018
7400eab
Corrected mistake
niden Sep 19, 2018
77f68c1
PHPCS fix
niden Sep 19, 2018
9f02f9f
[#13492] Added deprecated in docblocks; Corrected logic in all adapters
niden Sep 19, 2018
8e2acb6
[#13492] Added @deprecated in the docblocks for total_items and getPa…
niden Sep 19, 2018
5121a71
[#13492] Corrected docblock
niden Sep 19, 2018
9842368
[#13492] Removed the new method from the interface to keep BC with cu…
niden Sep 19, 2018
967e658
fix: setFileToSend filename last much "_"
cq-z Sep 20, 2018
ca17221
docs: add change log
cq-z Sep 20, 2018
0479ee5
fix: quotes error
cq-z Sep 20, 2018
b15211f
Merge remote-tracking branch 'upstream/3.4.x' into 3.4.x
niden Sep 20, 2018
682193d
Added change to the changelog
niden Sep 20, 2018
d472fe2
Add documentation for Route::convert [ci skip]
legale Sep 30, 2018
6b9615d
Update CHANGELOG-3.4.md
crnjakovic Oct 4, 2018
903d488
Merge branch '3.4.x' into patch-1
niden Oct 4, 2018
72cfb5e
Merge pull request #13496 from cq-z/filename_error
niden Oct 4, 2018
6a9f476
Merge branch '3.4.x' into patch-1
niden Oct 4, 2018
ea3060b
Merge pull request #13479 from scrnjakovic/patch-1
niden Oct 4, 2018
343cc24
Merge pull request #13100 from 1RV34/3.2.x
niden Oct 4, 2018
42e6c2b
Added changelog for PR 13100
niden Oct 4, 2018
9fcf772
Merge remote-tracking branch 'upstream/3.4.x' into 3.4.x
niden Oct 4, 2018
94f9bb8
Fixes #11605: Parameters are stored in _bindParams when calling execute
CameronHall Sep 2, 2018
777123c
Merge pull request #13480 from CameronHall/bugfix/subquery-binded-params
niden Oct 5, 2018
f486d86
Fixes #13447: Added Volt tags to array helper in Volt Compiler
CameronHall Oct 7, 2018
2a5ac14
- Refactor `Phalcon\Db\Adapter\Pdo::query` in fetchOne get All fetch …
cq-z Oct 8, 2018
42d5208
fix: pdo::exec error
cq-z Oct 8, 2018
8a3d602
fix: changelog error。
cq-z Oct 8, 2018
8131598
Fixes #13501: getJsonRawBody() handles empty body and JSON decode errors
CameronHall Oct 8, 2018
87b5cbe
Merge pull request #13514 from CameronHall/bugfix/volt-compiler
niden Oct 8, 2018
9f2f41c
Merge branch '3.4.x' into bugfix/getRawJsonBody
niden Oct 8, 2018
0629bb3
Merge pull request #13516 from CameronHall/bugfix/getRawJsonBody
niden Oct 8, 2018
a265084
Refactor: `Phalcon\Db\Adapter\Pdo::query` in fetchOne get All fetch One
cq-z Oct 9, 2018
a7bd734
Merge branch '3.4.x' into feature/optimize-pdo
cq-z Oct 9, 2018
ec30392
Refactor: `Phalcon\Db\Adapter\Pdo::query` in fetchOne get All fetch One
cq-z Oct 9, 2018
ea8b787
Merge branch 'feature/optimize-pdo' of https://github.com/cq-z/cphalc…
cq-z Oct 9, 2018
486bcf6
Merge pull request #13515 from cq-z/feature/optimize-pdo
niden Oct 9, 2018
18c7682
Merge pull request #13493 from niden/3.4.x
niden Oct 10, 2018
6976f30
[#13447] - Added search_field in the volt compiler helpers
niden Oct 11, 2018
28886f3
Merge pull request #13521 from niden/3.4.x
niden Oct 11, 2018
f5c70c2
[#13529] - Moved the sharedLock in the dialects. PostgreSql and Sqlit…
niden Oct 16, 2018
a225614
Merge pull request #13532 from niden/T13529-shared-lock-bug
niden Oct 18, 2018
3990575
Add PHP 7.3 support [skip appveyor] (#13511)
sergeyklay Oct 21, 2018
dc71440
allowEmpty list cannot handle Objects
someson Oct 22, 2018
7196db5
Update phalcon/validation.zep
naoyayamamoto Oct 26, 2018
43b36e7
Merge pull request #13553 from naoyayamamoto/patch
niden Oct 28, 2018
40b345b
Merge pull request #13549 from someson/allow-empty-with-objects
niden Nov 1, 2018
f75f328
Fixed Phalcon\Validation::preChecking
sergeyklay Nov 3, 2018
00b6532
Minor CI's config refactor and improvements
sergeyklay Nov 3, 2018
bdfc00e
Minor CI's config refactor and improvements (2) [skip appveyor]
sergeyklay Nov 3, 2018
74a3a4c
Use latest Zephir Parser
sergeyklay Nov 7, 2018
25a0ddd
Fixed RawValue objects being prepared instead of inserted
CameronHall Nov 7, 2018
ca53cca
Updated stale to not close issues labelled as bugs
CameronHall Nov 8, 2018
0a0e77e
Update build/test deps for AppVeyor
sergeyklay Nov 13, 2018
2d36903
Update build/test deps for Travis CI
sergeyklay Nov 13, 2018
b2d108c
Enabled syntax tests back [skip appveyor]
sergeyklay Nov 13, 2018
43a0f89
Fixed #12725: Numeric INI config now builds properly
Nov 19, 2018
3cbfdc1
Updated Changelog [ci skip]
Nov 19, 2018
bc5f78a
Use latest Zephir from the 0.10.x branch [skip appveyor]
sergeyklay Nov 18, 2018
e682a69
AppVeyor use latest Zephir
sergeyklay Nov 20, 2018
f66e29f
Cleaned up change log [ci skip]
sergeyklay Nov 21, 2018
260c529
Removed irrelevant comment [ci skip]
sergeyklay Nov 21, 2018
a808182
Changes for upcoming Travis' infra migration [skip appveyor]
sergeyklay Nov 21, 2018
4bdaa17
Add CODE_OF_CONDUCT.md
stamster Nov 14, 2018
9c08c45
email addr
stamster Nov 14, 2018
069cf76
fix all interface definitions
Izopi4a Nov 10, 2018
60312f6
Update build/test deps for Travis CI
sergeyklay Nov 13, 2018
264b2c2
Enabled syntax tests back [skip appveyor]
sergeyklay Nov 13, 2018
e4a5344
fix issue 13351 merge config on non-zero-based numeric index
zamronypj Apr 26, 2018
b07c259
Fixes #13351: Numeric config properties merge correctly now
Nov 21, 2018
45df289
Bump version
sergeyklay Dec 2, 2018
c3a88cb
Use latest Zephir from the 0.10.x branch
sergeyklay Dec 2, 2018
5d47d5a
Regenerated build (PHP5)
sergeyklay Dec 2, 2018
3b55639
Regenerated build (PHP7)
sergeyklay Dec 2, 2018
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
Prev Previous commit
Next Next commit
Refactor: Phalcon\Db\Adapter\Pdo::query in fetchOne get All fetch One
  • Loading branch information
cq-z committed Oct 9, 2018
commit a265084fc5e3196355c88cbe2ab3a64e51a1807a
3 changes: 1 addition & 2 deletions CHANGELOG-3.4.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
- Fixed `Phalcon\Tag` so it unsets `parameters` before passing options array to `self::renderAttributes`
- Fixed `\Phalcon\Http\Response::setFileToSend` filename; when file downloaded it had an extra `_`
- Added the ability to explicitly define nullable columns (especially timestamp ones). [#13099](https://github.com/phalcon/cphalcon/issues/13099)
- Refactor `Phalcon\Db\Adapter\Pdo::query` in fetchOne get All fetch One, `Phalcon\Db\Adapter::queryAll` use `pdo::queryAll`

- Refactored `Phalcon\Db\Adapter\Pdo::query` to use PDO's prepare and execute. `Phalcon\Db\Adapter::fetchAll` to use PDO's fetchAll

# [3.4.1](https://github.com/phalcon/cphalcon/releases/tag/v3.4.1) (2018-08-04)
- Changed `Phalcon\Cache\Backend\Redis` to support connection timeout parameter
Expand Down
17 changes: 11 additions & 6 deletions phalcon/db/adapter/pdo.zep
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,18 @@ abstract class Pdo extends Adapter

let pdo = <\Pdo> this->_pdo;
if typeof bindParams == "array" {
let statement = pdo->prepare(sqlStatement);
if typeof statement == "object" {
let statement = this->executePrepared(statement, bindParams, bindTypes);
}
let params = bindParams;
let types = bindTypes;
} else {
let statement = pdo->prepare(sqlStatement);
statement->execute();
let params = [];
let types = [];
}

let statement = pdo->prepare(sqlStatement);
if typeof statement == "object" {
let statement = this->executePrepared(statement, params, types);
} else {
throw new Exception("Cannot prepare statement");
}

/**
Expand Down