[limb-svn] r6055 - in 3.x/trunk/limb: active_record/tests/cases cms/tests/cases dbal/src dbal/tests/cases/non-driver dbal/tests/cases/non-driver/dump search/tests/cases session/tests/cases tree/tests/cases web_app/tests/cases/db
svn at limb-project.com
svn at limb-project.com
Tue Jul 3 14:52:02 MSD 2007
Author: pachanga
Date: 2007-07-03 14:52:01 +0400 (Tue, 03 Jul 2007)
New Revision: 6055
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6055
Added:
3.x/trunk/limb/dbal/src/lmbDbDump.class.php
Removed:
3.x/trunk/limb/dbal/src/lmbTestDbDump.class.php
Modified:
3.x/trunk/limb/active_record/tests/cases/.setup.php
3.x/trunk/limb/cms/tests/cases/.setup.php
3.x/trunk/limb/dbal/tests/cases/non-driver/.setup.php
3.x/trunk/limb/dbal/tests/cases/non-driver/dump/lmbMysqlDumpLoaderTest.class.php
3.x/trunk/limb/search/tests/cases/.setup.php
3.x/trunk/limb/session/tests/cases/.setup.php
3.x/trunk/limb/tree/tests/cases/.setup.php
3.x/trunk/limb/web_app/tests/cases/db/.setup.php
3.x/trunk/limb/web_app/tests/cases/db/.teardown.php
Log:
-- lmbTestDbDump => lmbDbDump
-- lmbDbDump :: load() added, db dump is not loaded in constructor anymore
Modified: 3.x/trunk/limb/active_record/tests/cases/.setup.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/.setup.php 2007-07-03 10:50:44 UTC (rev 6054)
+++ 3.x/trunk/limb/active_record/tests/cases/.setup.php 2007-07-03 10:52:01 UTC (rev 6055)
@@ -1,7 +1,8 @@
<?php
-require_once('limb/dbal/src/lmbTestDbDump.class.php');
+require_once('limb/dbal/src/lmbDbDump.class.php');
$type = lmbToolkit :: instance()->getDefaultDbConnection()->getType();
-$this->dump = new lmbTestDbDump(dirname(__FILE__) . '/.fixture/init_tests.' . $type);
+$this->dump = new lmbDbDump(dirname(__FILE__) . '/.fixture/init_tests.' . $type);
+$this->dump->load();
?>
Modified: 3.x/trunk/limb/cms/tests/cases/.setup.php
===================================================================
--- 3.x/trunk/limb/cms/tests/cases/.setup.php 2007-07-03 10:50:44 UTC (rev 6054)
+++ 3.x/trunk/limb/cms/tests/cases/.setup.php 2007-07-03 10:52:01 UTC (rev 6055)
@@ -1,5 +1,5 @@
<?php
-require_once('limb/dbal/src/lmbTestDbDump.class.php');
-
-$this->dump = new lmbTestDbDump(dirname(__FILE__) . '/.fixtures/init_tests.mysql');
+require_once('limb/dbal/src/lmbDbDump.class.php');
+$this->dump = new lmbDbDump(dirname(__FILE__) . '/.fixtures/init_tests.mysql');
+$this->dump->load();
?>
Copied: 3.x/trunk/limb/dbal/src/lmbDbDump.class.php (from rev 6048, 3.x/trunk/limb/dbal/src/lmbTestDbDump.class.php)
===================================================================
--- 3.x/trunk/limb/dbal/src/lmbDbDump.class.php (rev 0)
+++ 3.x/trunk/limb/dbal/src/lmbDbDump.class.php 2007-07-03 10:52:01 UTC (rev 6055)
@@ -0,0 +1,55 @@
+<?php
+/*
+ * Limb PHP Framework
+ *
+ * @link http://limb-project.com
+ * @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
+ * @license LGPL http://www.gnu.org/copyleft/lesser.html
+ */
+lmb_require('limb/dbal/src/dump/lmbSQLDumpLoader.class.php');
+
+/**
+ * class lmbDbDump.
+ *
+ * @package dbal
+ * @version $Id$
+ */
+class lmbDbDump
+{
+ protected $file;
+ protected $loader;
+ protected $connection;
+
+ function __construct($file, $connection = null)
+ {
+ $this->file = $file;
+
+ if($connection)
+ $this->connection = $connection;
+ else
+ $this->connection = lmbToolkit :: instance()->getDefaultDbConnection();
+ }
+
+ function load()
+ {
+ $type = $this->connection->getType();
+
+ $default_loader = 'lmbSQLDumpLoader';
+ $loader = 'lmb' . ucfirst($type) . 'DumpLoader';
+
+ if(file_exists(dirname(__FILE__) . '/dump/' . $loader . '.class.php'))
+ require_once(dirname(__FILE__) . '/dump/' . $loader . '.class.php');
+ else
+ $loader = $default_loader;
+
+ $this->loader = new $loader($this->file);
+ $this->loader->execute($this->connection);
+ }
+
+ function clean()
+ {
+ $this->loader->cleanTables($this->connection);
+ }
+}
+
+?>
Deleted: 3.x/trunk/limb/dbal/src/lmbTestDbDump.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/lmbTestDbDump.class.php 2007-07-03 10:50:44 UTC (rev 6054)
+++ 3.x/trunk/limb/dbal/src/lmbTestDbDump.class.php 2007-07-03 10:52:01 UTC (rev 6055)
@@ -1,55 +0,0 @@
-<?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com
- * @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
- * @license LGPL http://www.gnu.org/copyleft/lesser.html
- */
-lmb_require('limb/dbal/src/dump/lmbSQLDumpLoader.class.php');
-
-/**
- * class lmbTestDbDump.
- *
- * @package dbal
- * @version $Id$
- */
-class lmbTestDbDump
-{
- protected $loader;
- protected $connection;
-
- function __construct($file = null, $connection = null)
- {
- if($connection)
- $this->connection = $connection;
- else
- $this->connection = lmbToolkit :: instance()->getDefaultDbConnection();
-
- if(!is_null($file))
- $this->_load($file);
- }
-
- function _load($file)
- {
- $type = $this->connection->getType();
-
- $default_loader = 'lmbSQLDumpLoader';
- $loader = 'lmb' . ucfirst($type) . 'DumpLoader';
-
- if(file_exists(dirname(__FILE__) . '/dump/' . $loader . '.class.php'))
- require_once(dirname(__FILE__) . '/dump/' . $loader . '.class.php');
- else
- $loader = $default_loader;
-
- $this->loader = new $loader($file);
- $this->loader->execute($this->connection);
- }
-
- function clean()
- {
- $this->loader->cleanTables($this->connection);
- }
-}
-
-?>
Modified: 3.x/trunk/limb/dbal/tests/cases/non-driver/.setup.php
===================================================================
--- 3.x/trunk/limb/dbal/tests/cases/non-driver/.setup.php 2007-07-03 10:50:44 UTC (rev 6054)
+++ 3.x/trunk/limb/dbal/tests/cases/non-driver/.setup.php 2007-07-03 10:52:01 UTC (rev 6055)
@@ -1,6 +1,6 @@
<?php
-lmb_require('limb/dbal/src/lmbTestDbDump.class.php');
+require_once('limb/dbal/src/lmbDbDump.class.php');
$type = lmbToolkit :: instance()->getDefaultDbConnection()->getType();
-$this->dump = new lmbTestDbDump(dirname(__FILE__) . '/.fixture/init_tests.' . $type);
-
+$this->dump = new lmbDbDump(dirname(__FILE__) . '/.fixture/init_tests.' . $type);
+$this->dump->load();
?>
Modified: 3.x/trunk/limb/dbal/tests/cases/non-driver/dump/lmbMysqlDumpLoaderTest.class.php
===================================================================
--- 3.x/trunk/limb/dbal/tests/cases/non-driver/dump/lmbMysqlDumpLoaderTest.class.php 2007-07-03 10:50:44 UTC (rev 6054)
+++ 3.x/trunk/limb/dbal/tests/cases/non-driver/dump/lmbMysqlDumpLoaderTest.class.php 2007-07-03 10:52:01 UTC (rev 6055)
@@ -1,19 +1,22 @@
<?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com
- * @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
- * @license LGPL http://www.gnu.org/copyleft/lesser.html
+/*
+ * Limb PHP Framework
+ *
+ * @link http://limb-project.com
+ * @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
+ * @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
lmb_require('limb/dbal/src/dump/lmbMysqlDumpLoader.class.php');
lmb_require(dirname(__FILE__) . '/lmbSQLDumpLoaderTestBase.class.php');
-if(!lmbToolkit :: instance()->getDefaultDbConnection() instanceof lmbMysqlConnection)
- SimpleTest :: ignore('lmbMysqlDumpLoaderTest');
-
class lmbMysqlDumpLoaderTest extends lmbSQLDumpLoaderTestBase
{
+ function skip()
+ {
+ $this->skipIf(!lmbToolkit :: instance()->getDefaultDbConnection() instanceof lmbMysqlConnection,
+ "lmbMysqlDumpLoader tests skipped, mysql connection required");
+ }
+
function _createLoader($file=null)
{
return new lmbMysqlDumpLoader($file);
Modified: 3.x/trunk/limb/search/tests/cases/.setup.php
===================================================================
--- 3.x/trunk/limb/search/tests/cases/.setup.php 2007-07-03 10:50:44 UTC (rev 6054)
+++ 3.x/trunk/limb/search/tests/cases/.setup.php 2007-07-03 10:52:01 UTC (rev 6055)
@@ -1,4 +1,5 @@
<?php
-lmb_require('limb/dbal/src/lmbTestDbDump.class.php');
-$this->dump = new lmbTestDbDump(dirname(__FILE__) . '/../../init/init_tests.sql');
+require_once('limb/dbal/src/lmbDbDump.class.php');
+$this->dump = new lmbDbDump(dirname(__FILE__) . '/../../init/init_tests.sql');
+$this->dump->load();
?>
Modified: 3.x/trunk/limb/session/tests/cases/.setup.php
===================================================================
--- 3.x/trunk/limb/session/tests/cases/.setup.php 2007-07-03 10:50:44 UTC (rev 6054)
+++ 3.x/trunk/limb/session/tests/cases/.setup.php 2007-07-03 10:52:01 UTC (rev 6055)
@@ -1,7 +1,6 @@
<?php
-
-lmb_require('limb/dbal/src/lmbTestDbDump.class.php');
+require_once('limb/dbal/src/lmbDbDump.class.php');
$type = lmbToolkit :: instance()->getDefaultDbConnection()->getType();
-$this->dump = new lmbTestDbDump(dirname(__FILE__) . '/.fixture/init_tests.' . $type);
-
+$this->dump = new lmbDbDump(dirname(__FILE__) . '/.fixture/init_tests.' . $type);
+$this->dump->load();
?>
Modified: 3.x/trunk/limb/tree/tests/cases/.setup.php
===================================================================
--- 3.x/trunk/limb/tree/tests/cases/.setup.php 2007-07-03 10:50:44 UTC (rev 6054)
+++ 3.x/trunk/limb/tree/tests/cases/.setup.php 2007-07-03 10:52:01 UTC (rev 6055)
@@ -1,6 +1,6 @@
<?php
-require_once('limb/dbal/src/lmbTestDbDump.class.php');
-
+require_once('limb/dbal/src/lmbDbDump.class.php');
$type = lmbToolkit :: instance()->getDefaultDbConnection()->getType();
-$this->dump = new lmbTestDbDump(dirname(__FILE__) . '/../../init/init_tests.' . $type);
+$this->dump = new lmbDbDump(dirname(__FILE__) . '/../../init/init_tests.' . $type);
+$this->dump->load();
?>
Modified: 3.x/trunk/limb/web_app/tests/cases/db/.setup.php
===================================================================
--- 3.x/trunk/limb/web_app/tests/cases/db/.setup.php 2007-07-03 10:50:44 UTC (rev 6054)
+++ 3.x/trunk/limb/web_app/tests/cases/db/.setup.php 2007-07-03 10:52:01 UTC (rev 6055)
@@ -1,6 +1,6 @@
<?php
-lmb_require('limb/dbal/src/lmbTestDbDump.class.php');
+require_once('limb/dbal/src/lmbDbDump.class.php');
$type = lmbToolkit :: instance()->getDefaultDbConnection()->getType();
-$this->dbal_dump = new lmbTestDbDump(dirname(__FILE__) . '/.fixture/init_tests.' . $type);
-
+$this->dump = new lmbDbDump(dirname(__FILE__) . '/.fixture/init_tests.' . $type);
+$this->dump->load();
?>
Modified: 3.x/trunk/limb/web_app/tests/cases/db/.teardown.php
===================================================================
--- 3.x/trunk/limb/web_app/tests/cases/db/.teardown.php 2007-07-03 10:50:44 UTC (rev 6054)
+++ 3.x/trunk/limb/web_app/tests/cases/db/.teardown.php 2007-07-03 10:52:01 UTC (rev 6055)
@@ -1,3 +1,3 @@
<?php
-$this->dbal_dump->clean();
+$this->dump->clean();
?>
More information about the limb-svn
mailing list