The branch "imp_6_2" has been updated. The following is a summary of the commits.
from: 8a576e952ab1000a0ddb92264600081ca7f1cb87 498b913 Make execute() and select() abstract, deprecate execute(). 8a7f6a0 Refactor unit tests (again). 6473f78 [jan] Don't ping server before each query in PDO drivers (Bug #12656). ad0c9e6 Use constant. 9ebe9f1 Possible fix for Bug: 12647, add missing 'id' attribute to form. cff7a6b Not used. e125ba7 phpdoc f21a905 We haven't needed this hack/workaround for sometime now. Remove. 91ce576 typo cd6639e This is not always a modseq value, log it accordingly. ec342e8 Tweak some comments/spacing. e83c71f phpdoc d19ee6e Support sending SOFTDELETE changes to the client. 269f539 Some comments while I'm poking around. f686341 [mms] Don't attempt to get quota information from non-IMAP mailboxes (Bug #12608). 02f123c Typo f31d7a7 Improved parsing of e-mail address input 949b895 Clean-up addresses when saving a draft c980954 Merge branch 'master' into imp_6_2 ----------------------------------------------------------------------- commit 498b91344be19447dbab841aeedf2543250dcbc3 Author: Jan Schneider <[email protected]> Date: Mon Sep 9 17:41:45 2013 +0200 Make execute() and select() abstract, deprecate execute(). framework/Alarm/lib/Horde/Alarm/Sql.php | 6 +- framework/Db/doc/Horde/Db/UPGRADING | 23 +++++++ framework/Db/lib/Horde/Db/Adapter/Base.php | 41 ++---------- framework/Db/lib/Horde/Db/Adapter/Mysql.php | 3 + framework/Db/lib/Horde/Db/Adapter/Mysqli.php | 5 +- framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php | 59 +++++++++++++++++ framework/Db/package.xml | 21 ++++--- framework/Db/test/Horde/Db/Adapter/MysqlTest.php | 8 -- framework/Db/test/Horde/Db/Adapter/MysqliTest.php | 8 -- framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php | 8 -- framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php | 8 -- framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php | 8 -- framework/Group/lib/Horde/Group/Sql.php | 2 +- kronolith/lib/Geo/Sql.php | 13 ++-- ulaform/lib/Driver/Sql.php | 14 ++-- 15 files changed, 126 insertions(+), 101 deletions(-) create mode 100644 framework/Db/doc/Horde/Db/UPGRADING http://git.horde.org/horde-git/-/commit/498b91344be19447dbab841aeedf2543250dcbc3 ----------------------------------------------------------------------- commit 8a7f6a0b48e43219cb9e918ed2155f078624786e Author: Jan Schneider <[email protected]> Date: Tue Sep 10 11:47:41 2013 +0200 Refactor unit tests (again). Centralize tests as much as possible to help with detecting differences between the implementations, and for easier code maintenance. framework/Db/lib/Horde/Db/Adapter/Base.php | 11 + framework/Db/lib/Horde/Db/Adapter/Pdo/Sqlite.php | 11 + framework/Db/package.xml | 30 +- framework/Db/test/Horde/Db/Adapter/Mysql/TableDefinition.php | 2 +- framework/Db/test/Horde/Db/Adapter/MysqlBase.php | 580 ++ framework/Db/test/Horde/Db/Adapter/MysqlTest.php | 1594 +---- framework/Db/test/Horde/Db/Adapter/MysqliTest.php | 1589 +---- framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php | 1581 +---- framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlBase.php | 76 - framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php | 1047 +--- framework/Db/test/Horde/Db/Adapter/Pdo/SqliteBase.php | 63 - framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php | 1015 +--- .../Db/test/Horde/Db/Adapter/Postgresql/ColumnDefinition.php | 106 + .../Db/test/Horde/Db/Adapter/Postgresql/ColumnDefinitionTest.php | 112 - framework/Db/test/Horde/Db/Adapter/Postgresql/TableDefinition.php | 74 + .../Db/test/Horde/Db/Adapter/Postgresql/TableDefinitionTest.php | 83 - framework/Db/test/Horde/Db/Adapter/Sqlite/ColumnDefinition.php | 113 + .../Db/test/Horde/Db/Adapter/Sqlite/ColumnDefinitionTest.php | 126 - framework/Db/test/Horde/Db/Adapter/Sqlite/TableDefinition.php | 70 + framework/Db/test/Horde/Db/Adapter/Sqlite/TableDefinitionTest.php | 89 - framework/Db/test/Horde/Db/Adapter/TestBase.php | 910 +++ 21 files changed, 1983 insertions(+), 7299 deletions(-) create mode 100644 framework/Db/test/Horde/Db/Adapter/MysqlBase.php delete mode 100644 framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlBase.php delete mode 100644 framework/Db/test/Horde/Db/Adapter/Pdo/SqliteBase.php create mode 100644 framework/Db/test/Horde/Db/Adapter/Postgresql/ColumnDefinition.php delete mode 100644 framework/Db/test/Horde/Db/Adapter/Postgresql/ColumnDefinitionTest.php create mode 100644 framework/Db/test/Horde/Db/Adapter/Postgresql/TableDefinition.php delete mode 100644 framework/Db/test/Horde/Db/Adapter/Postgresql/TableDefinitionTest.php create mode 100644 framework/Db/test/Horde/Db/Adapter/Sqlite/ColumnDefinition.php delete mode 100644 framework/Db/test/Horde/Db/Adapter/Sqlite/ColumnDefinitionTest.php create mode 100644 framework/Db/test/Horde/Db/Adapter/Sqlite/TableDefinition.php delete mode 100644 framework/Db/test/Horde/Db/Adapter/Sqlite/TableDefinitionTest.php create mode 100644 framework/Db/test/Horde/Db/Adapter/TestBase.php http://git.horde.org/horde-git/-/commit/8a7f6a0b48e43219cb9e918ed2155f078624786e ----------------------------------------------------------------------- commit 6473f788bd06787aecea9fbce3cde8ea6f3491ea Author: Jan Schneider <[email protected]> Date: Tue Sep 10 14:50:52 2013 +0200 [jan] Don't ping server before each query in PDO drivers (Bug #12656). framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php | 2 -- framework/Db/package.xml | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/6473f788bd06787aecea9fbce3cde8ea6f3491ea ----------------------------------------------------------------------- commit ad0c9e6b7452305bd0d27b7d891c92516430a5b4 Author: Michael J Rubinsky <[email protected]> Date: Mon Sep 9 17:21:23 2013 -0400 Use constant. framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/ad0c9e6b7452305bd0d27b7d891c92516430a5b4 ----------------------------------------------------------------------- commit 9ebe9f17212899b402e82c5575437e7eac512f4b Author: Michael J Rubinsky <[email protected]> Date: Tue Sep 10 09:11:39 2013 -0400 Possible fix for Bug: 12647, add missing 'id' attribute to form. turba/templates/browse/actions.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/9ebe9f17212899b402e82c5575437e7eac512f4b ----------------------------------------------------------------------- commit cff7a6ba7c3d12d21b916431c22ec0ae032d025a Author: Michael J Rubinsky <[email protected]> Date: Tue Sep 10 10:08:00 2013 -0400 Not used. framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/cff7a6ba7c3d12d21b916431c22ec0ae032d025a ----------------------------------------------------------------------- commit e125ba712a56ee3ab0dbec0b6f7cf53f010b6c41 Author: Michael J Rubinsky <[email protected]> Date: Tue Sep 10 10:25:00 2013 -0400 phpdoc framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/e125ba712a56ee3ab0dbec0b6f7cf53f010b6c41 ----------------------------------------------------------------------- commit f21a9056bd2d4ffa9ee770ee4f598fab967d1ecf Author: Michael J Rubinsky <[email protected]> Date: Tue Sep 10 10:37:10 2013 -0400 We haven't needed this hack/workaround for sometime now. Remove. framework/ActiveSync/lib/Horde/ActiveSync.php | 1 + framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 21 -- framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 66 +++--- 3 files changed, 32 insertions(+), 56 deletions(-) http://git.horde.org/horde-git/-/commit/f21a9056bd2d4ffa9ee770ee4f598fab967d1ecf ----------------------------------------------------------------------- commit 91ce5764c7c6e591d91d1c54697b95e4bd051a45 Author: Michael J Rubinsky <[email protected]> Date: Tue Sep 10 10:37:35 2013 -0400 typo framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/91ce5764c7c6e591d91d1c54697b95e4bd051a45 ----------------------------------------------------------------------- commit cd6639e100872539aac4290e2514de48ff46853f Author: Michael J Rubinsky <[email protected]> Date: Tue Sep 10 10:40:52 2013 -0400 This is not always a modseq value, log it accordingly. framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/cd6639e100872539aac4290e2514de48ff46853f ----------------------------------------------------------------------- commit ec342e8e82de75c30090dff56293cb32aba826b3 Author: Michael J Rubinsky <[email protected]> Date: Tue Sep 10 10:44:03 2013 -0400 Tweak some comments/spacing. framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/ec342e8e82de75c30090dff56293cb32aba826b3 ----------------------------------------------------------------------- commit e83c71f2dfb1576e1e28cf206af6297370f939e4 Author: Michael J Rubinsky <[email protected]> Date: Tue Sep 10 10:45:47 2013 -0400 phpdoc framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/e83c71f2dfb1576e1e28cf206af6297370f939e4 ----------------------------------------------------------------------- commit d19ee6e8698f2523d388aa287a9e86b807ca2ea5 Author: Michael J Rubinsky <[email protected]> Date: Tue Sep 10 10:54:57 2013 -0400 Support sending SOFTDELETE changes to the client. This commit just supports the sending of the change, does not implement detecting the changes. That will go in Core. framework/ActiveSync/lib/Horde/ActiveSync.php | 1 + framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php | 13 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/d19ee6e8698f2523d388aa287a9e86b807ca2ea5 ----------------------------------------------------------------------- commit 269f539ebaf522eb5f70e98f40ca5622995d8ef5 Author: Michael J Rubinsky <[email protected]> Date: Tue Sep 10 10:55:37 2013 -0400 Some comments while I'm poking around. framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/269f539ebaf522eb5f70e98f40ca5622995d8ef5 ----------------------------------------------------------------------- commit f686341e9172e5413d6f20d84a4327ab8d781621 Author: Michael M Slusarz <[email protected]> Date: Tue Sep 10 09:47:09 2013 -0600 [mms] Don't attempt to get quota information from non-IMAP mailboxes (Bug #12608). imp/docs/CHANGES | 4 +++- imp/lib/Quota/Ui.php | 7 +++++++ imp/package.xml | 6 ++++-- 3 files changed, 14 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/f686341e9172e5413d6f20d84a4327ab8d781621 ----------------------------------------------------------------------- commit 02f123cbeb9ef168c6992757c3793f0b3dca8f9f Author: Michael J Rubinsky <[email protected]> Date: Tue Sep 10 12:41:52 2013 -0400 Typo framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/02f123cbeb9ef168c6992757c3793f0b3dca8f9f ----------------------------------------------------------------------- commit f31d7a749f9c98a528d77c79dace8681229db0ae Author: Michael M Slusarz <[email protected]> Date: Tue Sep 10 12:15:21 2013 -0600 Improved parsing of e-mail address input imp/lib/Compose.php | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/f31d7a749f9c98a528d77c79dace8681229db0ae ----------------------------------------------------------------------- commit 949b895197b340d1df9db91d17c29a7de997dec4 Author: Michael M Slusarz <[email protected]> Date: Tue Sep 10 12:17:10 2013 -0600 Clean-up addresses when saving a draft imp/lib/Compose.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/949b895197b340d1df9db91d17c29a7de997dec4 ----------------------------------------------------------------------- commit c980954263f636751c3d7c69f615b51644dbb86e Merge: 8a576e9 949b895 Author: Michael M Slusarz <[email protected]> Date: Tue Sep 10 12:54:26 2013 -0600 Merge branch 'master' into imp_6_2 Conflicts: imp/package.xml framework/ActiveSync/lib/Horde/ActiveSync.php | 2 + framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 7 + framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php | 18 +- framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 21 - framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php | 4 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 3 - framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 89 +- framework/Alarm/lib/Horde/Alarm/Sql.php | 6 +- framework/Db/doc/Horde/Db/UPGRADING | 23 + framework/Db/lib/Horde/Db/Adapter/Base.php | 52 +- framework/Db/lib/Horde/Db/Adapter/Mysql.php | 3 + framework/Db/lib/Horde/Db/Adapter/Mysqli.php | 5 +- framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php | 57 + framework/Db/lib/Horde/Db/Adapter/Pdo/Sqlite.php | 11 + framework/Db/package.xml | 49 +- framework/Db/test/Horde/Db/Adapter/Mysql/TableDefinition.php | 2 +- framework/Db/test/Horde/Db/Adapter/MysqlBase.php | 580 ++ framework/Db/test/Horde/Db/Adapter/MysqlTest.php | 1602 +---- framework/Db/test/Horde/Db/Adapter/MysqliTest.php | 1597 +---- framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php | 1589 +---- framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlBase.php | 76 - framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php | 1055 +--- framework/Db/test/Horde/Db/Adapter/Pdo/SqliteBase.php | 63 - framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php | 1023 +--- .../Db/test/Horde/Db/Adapter/Postgresql/ColumnDefinition.php | 106 + .../Db/test/Horde/Db/Adapter/Postgresql/ColumnDefinitionTest.php | 112 - framework/Db/test/Horde/Db/Adapter/Postgresql/TableDefinition.php | 74 + .../Db/test/Horde/Db/Adapter/Postgresql/TableDefinitionTest.php | 83 - framework/Db/test/Horde/Db/Adapter/Sqlite/ColumnDefinition.php | 113 + .../Db/test/Horde/Db/Adapter/Sqlite/ColumnDefinitionTest.php | 126 - framework/Db/test/Horde/Db/Adapter/Sqlite/TableDefinition.php | 70 + framework/Db/test/Horde/Db/Adapter/Sqlite/TableDefinitionTest.php | 89 - framework/Db/test/Horde/Db/Adapter/TestBase.php | 910 +++ framework/Group/lib/Horde/Group/Sql.php | 2 +- imp/docs/CHANGES | 4 +- imp/lib/Compose.php | 16 +- imp/lib/Quota/Ui.php | 7 + imp/package.xml | 3 +- kronolith/lib/Geo/Sql.php | 13 +- turba/templates/browse/actions.inc | 2 +- ulaform/lib/Driver/Sql.php | 14 +- 41 files changed, 2211 insertions(+), 7470 deletions(-) http://git.horde.org/horde-git/-/commit/c980954263f636751c3d7c69f615b51644dbb86e -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
