Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/9946] Allow storage of data >4kB on Oracle again
This commit is contained in:
Andreas Fischer 2011-03-24 09:22:36 +01:00
commit 3a0a18ee25

View file

@ -269,11 +269,12 @@ class dbal_oracle extends dbal
{ {
$cols = explode(', ', $regs[2]); $cols = explode(', ', $regs[2]);
preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
/* The code inside this comment block breaks clob handling, but does allow the /* The code inside this comment block breaks clob handling, but does allow the
database restore script to work. If you want to allow no posts longer than 4KB database restore script to work. If you want to allow no posts longer than 4KB
and/or need the db restore script, uncomment this. and/or need the db restore script, uncomment this.
preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
if (sizeof($cols) !== sizeof($vals)) if (sizeof($cols) !== sizeof($vals))
{ {