[icinga-checkins] icinga.org: icinga-api/mhein/default: Merge branch 'master' of git.icinga. org:icinga-api into mhein/default

git at icinga.org git at icinga.org
Mon Jul 19 17:43:04 CEST 2010


Module: icinga-api
Branch: mhein/default
Commit: cb9d4a1b9f5c710304a5ab27650ef530590e6e9a
URL:    https://git.icinga.org/?p=icinga-api.git;a=commit;h=cb9d4a1b9f5c710304a5ab27650ef530590e6e9a

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Jul 19 11:15:23 2010 +0200

Merge branch 'master' of git.icinga.org:icinga-api into mhein/default

---

 .buildpath                                         |    1 +
 .gitignore                                         |    6 +
 .settings/org.eclipse.php.core.prefs               |    4 +-
 IcingaApi.php                                      |   14 +-
 Makefile.in                                        |   28 +-
 contrib/ido2dbparser/.gitignore                    |    1 +
 icinga-api                                         |    1 +
 objects/IcingaApiConstantsInterface.php            |    6 +-
 objects/connection/IcingaApiConnectionDatabase.php |   10 +-
 .../icingaApiDebuggerTargetInterface.php           |    5 +
 .../debug/debugTargets/icingaApiEchoDebugger.php   |   18 +
 .../debug/debugTargets/icingaApiFileDebugger.php   |   35 +
 objects/debug/icingaApiDebugger.php                |  192 ++
 objects/ociPDO/PDO/ociPDO.php                      |  147 ++
 objects/ociPDO/PDO/ociPDOStatement.php             |  191 ++
 objects/ociPDO/icingaApiPDO.php                    |    9 +
 objects/result/IcingaApiResultIdo.php              |   55 +-
 objects/search/IcingaApiSearch.php                 |   11 +-
 objects/search/IcingaApiSearchColumnsFile.php      |    4 +-
 objects/search/IcingaApiSearchIdo.php              |  100 +-
 .../data_interfaces/IcingaApiSearchIdoMysql.php    |  150 +-
 .../data_interfaces/IcingaApiSearchIdoOci8.php     |  688 +++++++
 .../data_interfaces/IcingaApiSearchIdoPgsql.php    |   40 +-
 .../IcingaApiSearchLivestatusSocket.php            |   10 +-
 tests/icingaApiTests.php                           |   25 +
 tests/idoTests/apiSearchDefinitions/custom.ini     |   37 +
 tests/idoTests/apiSearchDefinitions/icinga-web.ini |  146 ++
 .../idoTests/apiSearchDefinitions/objectsearch.ini |   35 +
 tests/idoTests/dbConfig.php                        |   32 +
 tests/idoTests/idoConnectionTest.php               |   39 +
 tests/idoTests/idoCreateSearchTest.php             |  230 +++
 tests/idoTests/testDatabases/mysql_delete.sql      |   39 +
 tests/idoTests/testDatabases/mysql_dump.sql        | 1144 ++++++++++++
 tests/idoTests/testDatabases/mysql_schema.sql      | 1558 ++++++++++++++++
 tests/idoTests/testDatabases/oci8_delete.sql       |   38 +
 tests/idoTests/testDatabases/oci8_schema.sql       | 1937 ++++++++++++++++++++
 tests/idoTests/testDatabases/oracle_dump.sql       | 1142 ++++++++++++
 tests/idoTests/testDatabases/pgsql.sql             | 1568 ++++++++++++++++
 tests/idoTests/testSuite.php                       |   19 +
 39 files changed, 9571 insertions(+), 144 deletions(-)

Diff:   https://git.icinga.org/?p=icinga-api.git;a=commitdiff;h=cb9d4a1b9f5c710304a5ab27650ef530590e6e9a




More information about the icinga-checkins mailing list