[commits] Horde branch master updated. 62b8744e42a344ddc99cb75c40b25faeb28aeef3

Jan Schneider jan at horde.org
Wed Jan 26 17:54:16 UTC 2011


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

from: 4826e6706fa69d5557456013abad338f3235a9c5

267a4d7 Wrap prompt message, and place default value after the prompt when using multiple choices.
5381a21 Fix path.
cce60da Add script for later migration of share data.
c0ec8e3 Show correct error message when running CLI scripts.
e2ebf3b Update db_migrate to support framework package migration.
aa5f136 Search all migration/ subdirectories for migration files. Now that's a piece of PHP5 code!
04d5c8d Add script to run any migration scripts from arbitrary directories.
6a3f9ed The horde-db-migrate scripts requires the Autoloader.
962da42 Don't simply sort migration scripts by name, this is going to break when we have schema versions with several digits.
1451114 Extend migration script to be more flexible.
c2b7adf Fix default value.
f9cfbc5 Fix installation path.
0e4f4d6 Fix migration installation path.
62b8744 Merge branch 'db-migrate-for-framework'

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

commit 267a4d7d82743b16d7b4ca92ecbedba26bbc04c9
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jan 20 19:07:48 2011 +0100

    Wrap prompt message, and place default value after the prompt when using
    multiple choices.

 framework/Cli/lib/Horde/Cli.php |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/267a4d7d82743b16d7b4ca92ecbedba26bbc04c9

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

commit 5381a21ab4ecc622589c229390da61d1ce9e9cbe
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jan 20 19:08:40 2011 +0100

    Fix path.

 kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/5381a21ab4ecc622589c229390da61d1ce9e9cbe

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

commit cce60da99100e262109fe3a40a193f6bbd4bf314
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jan 20 19:09:20 2011 +0100

    Add script for later migration of share data.

 kronolith/scripts/upgrades/convert_sql_shares_to_sqlng.php |   31 ++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)
 create mode 100755 kronolith/scripts/upgrades/convert_sql_shares_to_sqlng.php

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

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

commit c0ec8e340eb825f2ff1864842d1624160d0807f9
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jan 20 19:32:16 2011 +0100

    Show correct error message when running CLI scripts.

 framework/Core/lib/Horde/Registry.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit e2ebf3bf21b445fa508b2f4a43f1eb372f0703b1
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jan 20 19:41:40 2011 +0100

    Update db_migrate to support framework package migration.

 horde/bin/db_migrate |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

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

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

commit aa5f1369cc0276ed4b3e64f80d3f6a2e1692f218
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 26 17:40:27 2011 +0100

    Search all migration/ subdirectories for migration files. Now that's a piece of
    PHP5 code!

 framework/Db/lib/Horde/Db/Migration/Migrator.php |   27 +++++++++++++++++----
 1 files changed, 22 insertions(+), 5 deletions(-)

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

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

commit 04d5c8d87242c091be9a3b22aeb26f8ea85c7678
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 26 17:41:55 2011 +0100

    Add script to run any migration scripts from arbitrary directories.

 framework/Db/bin/horde-db-migrate |  102 +++++++++++++++++++++++++++++++++++++
 1 files changed, 102 insertions(+), 0 deletions(-)
 create mode 100755 framework/Db/bin/horde-db-migrate

http://git.horde.org/horde-git/-/commit/04d5c8d87242c091be9a3b22aeb26f8ea85c7678

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

commit 6a3f9edfaa57fe624841a2d8c508dcc57de98827
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 26 17:43:07 2011 +0100

    The horde-db-migrate scripts requires the Autoloader.

 framework/Db/package.xml |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/6a3f9edfaa57fe624841a2d8c508dcc57de98827

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

commit 962da42f7141ce8d3993637ddf1f825acfc7ae9c
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 26 17:56:25 2011 +0100

    Don't simply sort migration scripts by name, this is going to break when we
    have schema versions with several digits.

 framework/Db/lib/Horde/Db/Migration/Migrator.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/962da42f7141ce8d3993637ddf1f825acfc7ae9c

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

commit 1451114a867d3c0f6135e9c6c182bbcc9376f148
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 26 18:45:41 2011 +0100

    Extend migration script to be more flexible.
    
    1) Run with directory name instead of application name to run all migrations in
    that directory.
    2) Run without any parameter to migrate all installed applications, all
    installed PEAR packages, and all framework packages from a local checkout.

 horde/bin/db_migrate |   96 +++++++++++++++++++++++++++++++++----------------
 1 files changed, 64 insertions(+), 32 deletions(-)

http://git.horde.org/horde-git/-/commit/1451114a867d3c0f6135e9c6c182bbcc9376f148

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

commit c2b7adf9ea6ac6ffff436d970b0540c5fb7fc078
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 26 18:45:58 2011 +0100

    Fix default value.

 imp/migration/2_imp_autoincrement_sentmail.php      |    2 +-
 wicked/migration/2_wicked_autoincrement_page_id.php |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

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

commit f9cfbc59b7c424d1fffb79a6b38e4c82d0076be9
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 26 18:46:22 2011 +0100

    Fix installation path.

 framework/Alarm/package.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit 0e4f4d601d11a4773436cce71882ca5f53f1ad12
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 26 18:50:22 2011 +0100

    Fix migration installation path.

 components/lib/Components/Pear/Package/Filelist/Default.php       |    4 +---
 .../Unit/Components/Pear/Package/Filelist/DefaultTest.php         |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/0e4f4d601d11a4773436cce71882ca5f53f1ad12

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

commit 62b8744e42a344ddc99cb75c40b25faeb28aeef3
Merge: 4826e67 0e4f4d6
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 26 18:52:25 2011 +0100

    Merge branch 'db-migrate-for-framework'
    
    Conflicts:
    	kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php
    	kronolith/scripts/upgrades/convert_sql_shares_to_sqlng.php

 components/lib/Components/Pear/Package/Filelist/Default.php       |    4 +-
 .../Unit/Components/Pear/Package/Filelist/DefaultTest.php         |    2 +-
 framework/Alarm/package.xml                                       |    2 +-
 framework/Db/bin/horde-db-migrate                                 |  102 +++++
 framework/Db/lib/Horde/Db/Migration/Migrator.php                  |   29 +-
 framework/Db/package.xml                                          |    4 +
 horde/bin/db_migrate                                              |   96 +++--
 imp/migration/2_imp_autoincrement_sentmail.php                    |    2 +-
 wicked/migration/2_wicked_autoincrement_page_id.php               |    2 +-
 9 files changed, 199 insertions(+), 44 deletions(-)

http://git.horde.org/horde-git/-/commit/62b8744e42a344ddc99cb75c40b25faeb28aeef3




More information about the commits mailing list