Skip to content

Commit

Permalink
Merge branch 'master' into 5.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
niden authored Feb 8, 2024
2 parents 1f2239e + e14ab77 commit 53c3411
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions CHANGELOG-5.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

### Removed

# Changelog

## [5.6.0](https://github.com/phalcon/cphalcon/releases/tag/v5.6.0) (2024-01-09)

### Changed
Expand Down
2 changes: 1 addition & 1 deletion phalcon/Db/Adapter/Pdo/Postgresql.zep
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ class Postgresql extends PdoAdapter
*/
if field[9] !== null {
let definition["default"] = preg_replace(
"/^'|'?::[[:alnum:][:space:]]+(\\[\\])?$/",
"/^'|'?::[[:alnum:][:space:]]+$/",
"",
field[9]
);
Expand Down

0 comments on commit 53c3411

Please sign in to comment.