Author: Tobias Schlitt
Date: 2007-03-06 16:56:05 +0100 (Tue, 06 Mar 2007)
New Revision: 4723
Log:
- Corrected manual generator tests to use correct data and quote properly.
- Removed custom sequence from standard tests.
# DatabaseSchema automatically creates sequences for auto increment fields.
Modified:
trunk/PersistentObject/tests/data/manual_generator_test.php
trunk/PersistentObject/tests/data/persistent_test_object.php
trunk/PersistentObject/tests/data/persistenttestobject.php
trunk/PersistentObject/tests/manual_generator_test.php
Modified: trunk/PersistentObject/tests/data/manual_generator_test.php
===================================================================
--- trunk/PersistentObject/tests/data/manual_generator_test.php 2007-03-06
14:36:52 UTC (rev 4722)
+++ trunk/PersistentObject/tests/data/manual_generator_test.php 2007-03-06
15:56:05 UTC (rev 4723)
@@ -30,19 +30,18 @@
public static function insertCleanData()
{
$db = ezcDbInstance::get();
- $db->exec( "insert into PO_test (id, type_varchar, type_integer,
+ $db->exec( "insert into " . $db->quoteIdentifier( "PO_test" ) . " (id,
type_varchar, type_integer,
type_decimal, type_text )
VALUES ( 1, 'Sweden', 9006405, 449.96, 'Sweden has nice
girls!' )" );
-
- $db->exec( "insert into PO_test (id, type_varchar, type_integer,
+ $db->exec( "insert into " . $db->quoteIdentifier( "PO_test" ) . " (id,
type_varchar, type_integer,
type_decimal, type_text )
VALUES (2, 'Norway', 4593041, 385.19, 'Norway has brown
goat cheese!' )" );
- $db->exec( "insert into PO_test (id, type_varchar, type_integer,
+ $db->exec( "insert into " . $db->quoteIdentifier( "PO_test" ) . " (id,
type_varchar, type_integer,
type_decimal, type_text )
VALUES (3, 'Ukraine', 47732079, 603.70, 'Ukraine has a
long coastline to the black see.' )" );
- $db->exec( "insert into PO_test (id, type_varchar, type_integer,
+ $db->exec( "insert into " . $db->quoteIdentifier( "PO_test" ) . " (id,
type_varchar, type_integer,
type_decimal, type_text )
VALUES (4, 'Germany', 82443000, 357.02, 'Home of the
lederhosen!.' )" );
}
@@ -57,7 +56,7 @@
{
$db = ezcDbInstance::get();
$schema = ezcDbSchema::createFromDb( $db );
- $schema->writeToFile( 'array', dirname( __FILE__ ) .
'/persistent_test_object.dba' );
+ $schema->writeToFile( 'array', dirname( __FILE__ ) .
'/persistent_test_object_no_auto_increment.dba' );
}
/**
@@ -67,25 +66,14 @@
{
$db = ezcDbInstance::get();
// Load schema
- $schema = ezcDbSchema::createFromFile( 'array', dirname( __FILE__ ) .
'/persistent_test_object.dba' );
+ $schema = ezcDbSchema::createFromFile( 'array', dirname( __FILE__ ) .
'/persistent_test_object_no_auto_increment.dba' );
$schema->writeToDb( $db );
-
- // create sequence if it is a postgres database
- if ( $db->getName() == 'pgsql' )
- {
- $db->exec( 'CREATE SEQUENCE PO_test_seq START 5' );
- }
-
}
public static function cleanup()
{
$db = ezcDbInstance::get();
- $db->exec( 'DROP TABLE PO_test' );
- if ( $db->getName() == 'pgsql' )
- {
- $db->exec( 'DROP SEQUENCE po_test_seq' );
- }
+ $db->exec( "DROP TABLE " . $db->quoteIdentifier( "PO_test" ) . ";" );
}
/*
Modified: trunk/PersistentObject/tests/data/persistent_test_object.php
===================================================================
--- trunk/PersistentObject/tests/data/persistent_test_object.php
2007-03-06 14:36:52 UTC (rev 4722)
+++ trunk/PersistentObject/tests/data/persistent_test_object.php
2007-03-06 15:56:05 UTC (rev 4723)
@@ -30,21 +30,21 @@
public static function insertCleanData()
{
$db = ezcDbInstance::get();
- $db->exec( "insert into " . $db->quoteIdentifier( "PO_test" ) . " (id,
type_varchar, type_integer,
+ $db->exec( "insert into " . $db->quoteIdentifier( "PO_test" ) . "
(type_varchar, type_integer,
type_decimal, type_text )
- VALUES ( 1, 'Sweden', 9006405, 449.96, 'Sweden has nice
girls!' )" );
+ VALUES ('Sweden', 9006405, 449.96, 'Sweden has nice
girls!' )" );
- $db->exec( "insert into " . $db->quoteIdentifier( "PO_test" ) . " (id,
type_varchar, type_integer,
+ $db->exec( "insert into " . $db->quoteIdentifier( "PO_test" ) . "
(type_varchar, type_integer,
type_decimal, type_text )
- VALUES (2, 'Norway', 4593041, 385.19, 'Norway has brown
goat cheese!' )" );
+ VALUES ('Norway', 4593041, 385.19, 'Norway has brown goat
cheese!' )" );
- $db->exec( "insert into " . $db->quoteIdentifier( "PO_test" ) . " (id,
type_varchar, type_integer,
+ $db->exec( "insert into " . $db->quoteIdentifier( "PO_test" ) . "
(type_varchar, type_integer,
type_decimal, type_text )
- VALUES (3, 'Ukraine', 47732079, 603.70, 'Ukraine has a
long coastline to the black see.' )" );
+ VALUES ('Ukraine', 47732079, 603.70, 'Ukraine has a long
coastline to the black see.' )" );
- $db->exec( "insert into " . $db->quoteIdentifier( "PO_test" ) . " (id,
type_varchar, type_integer,
+ $db->exec( "insert into " . $db->quoteIdentifier( "PO_test" ) . "
(type_varchar, type_integer,
type_decimal, type_text )
- VALUES (4, 'Germany', 82443000, 357.02, 'Home of the
lederhosen!.' )" );
+ VALUES ('Germany', 82443000, 357.02, 'Home of the
lederhosen!.' )" );
}
/**
@@ -78,23 +78,12 @@
$schema = ezcDbSchema::createFromFile( 'array', dirname( __FILE__
) . '/persistent_test_object_no_auto_increment.dba' );
}
$schema->writeToDb( $db );
-
- // create sequence if it is a postgres database
- if ( $db->getName() == 'pgsql' )
- {
- $db->exec( "CREATE SEQUENCE " . $db->quoteIdentifier(
"PO_test_seq" ) . " START 5" );
- }
-
}
public static function cleanup()
{
$db = ezcDbInstance::get();
$db->exec( "DROP TABLE " . $db->quoteIdentifier( "PO_test" ) . ";" );
- if ( $db->getName() == 'pgsql' )
- {
- $db->exec( "DROP SEQUENCE " . $db->quoteIdentifier( "PO_test_seq"
) . ";" );
- }
}
/*
Modified: trunk/PersistentObject/tests/data/persistenttestobject.php
===================================================================
--- trunk/PersistentObject/tests/data/persistenttestobject.php 2007-03-06
14:36:52 UTC (rev 4722)
+++ trunk/PersistentObject/tests/data/persistenttestobject.php 2007-03-06
15:56:05 UTC (rev 4723)
@@ -15,8 +15,10 @@
$def->idProperty->columnName = 'id';
$def->idProperty->propertyName = 'id';
$def->idProperty->visibility = ezcPersistentObjectProperty::VISIBILITY_PRIVATE;
-$def->idProperty->generator = new ezcPersistentGeneratorDefinition(
'ezcPersistentSequenceGenerator',
- array(
'sequence' => 'PO_test_seq' ) );
+$def->idProperty->generator = new ezcPersistentGeneratorDefinition(
+ 'ezcPersistentSequenceGenerator',
+ array( 'sequence' => 'PO_test_id_seq' )
+);
$def->properties['varchar'] = new ezcPersistentObjectProperty;
$def->properties['varchar']->columnName = 'type_varchar';
Modified: trunk/PersistentObject/tests/manual_generator_test.php
===================================================================
--- trunk/PersistentObject/tests/manual_generator_test.php 2007-03-06
14:36:52 UTC (rev 4722)
+++ trunk/PersistentObject/tests/manual_generator_test.php 2007-03-06
15:56:05 UTC (rev 4723)
@@ -33,8 +33,8 @@
$this->markTestSkipped( 'There was no database configured' );
}
- PersistentTestObject::setupTable( false ); /* No auto increment */
- PersistentTestObject::insertCleanData();
+ ManualGeneratorTest::setupTable();
+ ManualGeneratorTest::insertCleanData();
// PersistentTestObject::saveSqlSchemas();
$this->session = new ezcPersistentSession( ezcDbInstance::get(),
new
ezcPersistentCodeManager( dirname( __FILE__ ) . "/data/" ) );
@@ -42,7 +42,7 @@
protected function tearDown()
{
- PersistentTestObject::cleanup();
+ ManualGeneratorTest::cleanup();
}
public static function suite()
--
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components
