[commits] Horde branch master updated. ff5ed2697b89512eba5c1af40345e303c77bccaa

Michael J. Rubinsky mrubinsk at horde.org
Sat Jan 22 02:13:07 UTC 2011


The branch "master" has been updated.
The following is a summary of the commits.

from: 9768cbf1b1ae369335e0675f0af78e3e5f03d7ec

41371a2 Move hierarchical functionality into The Sql and Sqlng share drivers.
c34017f SqlHierarchical driver is no more
ff5ed26 Remove hierarchical driver, update package.xml

-----------------------------------------------------------------------

commit 41371a2a2760aa0d684dfeb4f7764293fd947388
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jan 21 21:03:01 2011 -0500

    Move hierarchical functionality into The Sql and Sqlng share drivers.
    
    Ansel is refactored to use the Sql driver for now. More refactoring is needed
    before it can be switched back and forth between any drivers. (Need to compose
    Horde_Share_Object with Ansel_Gallery instead of Ansel_Gallery extending the
    share object).
    
    Squashed commit of the following:
    
    commit ed76634819d4e6c1737366d5ffafbfcc0630d12c
    Author: Michael J. Rubinsky <mrubinsk at horde.org>
    Date:   Fri Jan 21 20:59:26 2011 -0500
    
        Need to check against share ids in Ansel, not share_names
    
    commit eb742b3414c3f27978beaa3c933f65f0e243efb2
    Author: Michael J. Rubinsky <mrubinsk at horde.org>
    Date:   Fri Jan 21 20:38:09 2011 -0500
    
        Cleanup/small refactoring for merged hierarchical driver
    
    commit b3e50233d7288f3007ddea45cb35e0724c664aed
    Author: Michael J. Rubinsky <mrubinsk at horde.org>
    Date:   Fri Jan 21 20:28:16 2011 -0500
    
        extend Horde_Share_Object_Sql for now.
    
        Need to refactor so Ansel_Gallery is composed with Horde_Share_Object instead
        of extending it.
    
    commit bb79f1f43aa7374cee325a70fd6849f52086ec75
    Author: Michael J. Rubinsky <mrubinsk at horde.org>
    Date:   Fri Jan 21 20:23:56 2011 -0500
    
        Simplify
    
    commit 76ae1f5d2bb28a9267e336d912f4bd2cc49a4894
    Author: Michael J. Rubinsky <mrubinsk at horde.org>
    Date:   Fri Jan 21 16:37:14 2011 -0500
    
        Merge hierarchical functionality into base sql and sqlng drivers.

 ansel/lib/Ansel.php                                               |   31 +-
 ansel/lib/Gallery.php                                             |   12 +-
 ansel/lib/Injector/Factory/Storage.php                            |    2 +-
 ansel/lib/Storage.php                                             |   13 +-
 ansel/lib/View/Gallery.php                                        |   24 +-
 ansel/lib/View/GalleryProperties.php                              |    1 +
 ansel/lib/View/GalleryRenderer/Base.php                           |   16 +-
 ansel/lib/View/GalleryRenderer/Gallery.php                        |   51 +-
 ansel/migration/8_ansel_upgrade_sqlhierarchical.php               |   47 +
 framework/Share/lib/Horde/Share/Base.php                          |   30 +-
 framework/Share/lib/Horde/Share/Kolab.php                         |   17 +
 framework/Share/lib/Horde/Share/Object/Sql.php                    |  119 +-
 framework/Share/lib/Horde/Share/Object/Sql/Hierarchical.php       |  270 +-
 framework/Share/lib/Horde/Share/Sql.php                           |  282 ++-
 framework/Share/lib/Horde/Share/Sql/Hierarchical.php              |  708 ++--
 framework/Share/lib/Horde/Share/Sqlng.php                         |   87 +-
 framework/Share/test/Horde/Share/Base.php                         |   95 +-
 framework/Share/test/Horde/Share/Sql/Base.php                     |    9 +
 framework/Share/test/Horde/Share/Sql/Pdo/MysqlTest.php            |    6 +-
 framework/Share/test/Horde/Share/Sql/Pdo/PgsqlTest.php            |    6 +-
 framework/Share/test/Horde/Share/Sql/Pdo/SqliteTest.php           |    6 +-
 framework/Share/test/Horde/Share/SqlHierarchical/Base.php         |    7 +-
 .../Share/test/Horde/Share/SqlHierarchical/Pdo/MysqlTest.php      |    6 +-
 .../Share/test/Horde/Share/SqlHierarchical/Pdo/PgsqlTest.php      |    6 +-
 .../Share/test/Horde/Share/SqlHierarchical/Pdo/SqliteTest.php     |    6 +-
 framework/Share/test/Horde/Share/Sqlng/Base.php                   |    9 +
 framework/Share/test/Horde/Share/migration/sql.php                |    1 +
 framework/Share/test/Horde/Share/migration/sqlng.php              |    1 +
 28 files changed, 1157 insertions(+), 711 deletions(-)
 create mode 100644 ansel/migration/8_ansel_upgrade_sqlhierarchical.php

http://git.horde.org/horde-git/-/commit/41371a2a2760aa0d684dfeb4f7764293fd947388

-----------------------------------------------------------------------

commit c34017f2b6ffbf02fa62da1449ec724518813671
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jan 21 21:08:42 2011 -0500

    SqlHierarchical driver is no more

 framework/Share/test/Horde/Share/SqlHierarchical/Base.php         |  234 -----
 framework/Share/test/Horde/Share/SqlHierarchical/MysqlTest.php    |   28 -
 framework/Share/test/Horde/Share/SqlHierarchical/MysqliTest.php   |   28 -
 .../Share/test/Horde/Share/SqlHierarchical/Pdo/MysqlTest.php      |   29 -
 .../Share/test/Horde/Share/SqlHierarchical/Pdo/PgsqlTest.php      |   29 -
 .../Share/test/Horde/Share/SqlHierarchical/Pdo/SqliteTest.php     |   26 -
 framework/Share/test/Horde/Share/migration/sql_hierarchical.php   |   53 -
 7 files changed, 0 insertions(+), 427 deletions(-)
 delete mode 100644 framework/Share/test/Horde/Share/SqlHierarchical/Base.php
 delete mode 100644 framework/Share/test/Horde/Share/SqlHierarchical/MysqlTest.php
 delete mode 100644 framework/Share/test/Horde/Share/SqlHierarchical/MysqliTest.php
 delete mode 100644 framework/Share/test/Horde/Share/SqlHierarchical/Pdo/MysqlTest.php
 delete mode 100644 framework/Share/test/Horde/Share/SqlHierarchical/Pdo/PgsqlTest.php
 delete mode 100644 framework/Share/test/Horde/Share/SqlHierarchical/Pdo/SqliteTest.php
 delete mode 100644 framework/Share/test/Horde/Share/migration/sql_hierarchical.php

http://git.horde.org/horde-git/-/commit/c34017f2b6ffbf02fa62da1449ec724518813671

-----------------------------------------------------------------------

commit ff5ed2697b89512eba5c1af40345e303c77bccaa
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jan 21 21:12:31 2011 -0500

    Remove hierarchical driver, update package.xml

 framework/Share/lib/Horde/Share/Object/Sql/Hierarchical.php |  182 ----
 framework/Share/lib/Horde/Share/Sql/Hierarchical.php        |  464 -----------
 framework/Share/package.xml                                 |   26 -
 3 files changed, 0 insertions(+), 672 deletions(-)
 delete mode 100644 framework/Share/lib/Horde/Share/Object/Sql/Hierarchical.php
 delete mode 100644 framework/Share/lib/Horde/Share/Sql/Hierarchical.php

http://git.horde.org/horde-git/-/commit/ff5ed2697b89512eba5c1af40345e303c77bccaa




More information about the commits mailing list