diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch gustavopiltcher/master (PR #2858)

Browse Source 
Commits
-------

4a797df Oracle issues
81d73bb Oracle issues
2316b21 Oracle issues
315bfc4 just update
b20b15b Oracle 10 issues

Discussion
----------

Oracle issues

updated with some adjustments required by stof

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

by fabpot at 2011-12-13T07:24:12Z

@schmittjoh: Can you have a look at this PR?

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

by fabpot at 2011-12-24T08:19:37Z

Can you squash your commit before I merge your PR? Thanks.
This commit is contained in:
Fabien Potencier 2012-01-22 10:45:17 +01:00
commit c290d829a7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
View File

@ -69,7 +69,7 @@ EOT
} }
} }
$schema = new Schema($tables); $schema = new Schema($tables, $sm->createSchemaConfig());
foreach ($schema->toSql($connection->getDatabasePlatform()) as $sql) { foreach ($schema->toSql($connection->getDatabasePlatform()) as $sql) {
$connection->exec($sql); $connection->exec($sql);
} }

8
src/Symfony/Component/Security/Acl/Dbal/Schema.php
View File

@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Acl\Dbal; namespace Symfony\Component\Security\Acl\Dbal;
use Doctrine\DBAL\Schema\Schema as BaseSchema; use Doctrine\DBAL\Schema\Schema as BaseSchema;
use Doctrine\DBAL\Schema\SchemaConfig;
/** /**
* The schema used for the ACL system. * The schema used for the ACL system.
@ -26,10 +27,11 @@ final class Schema extends BaseSchema
* Constructor * Constructor
* *
* @param array $options the names for tables * @param array $options the names for tables
* @param SchemaConfig $schemaConfig
*/ */
public function __construct(array $options) public function __construct(array $options, SchemaConfig $schemaConfig = null)
{ {
parent::__construct(); parent::__construct(array(), array(), $schemaConfig);
$this->options = $options; $this->options = $options;
@ -97,7 +99,7 @@ final class Schema extends BaseSchema
$table->addUniqueIndex(array('object_identifier', 'class_id')); $table->addUniqueIndex(array('object_identifier', 'class_id'));
$table->addIndex(array('parent_object_identity_id')); $table->addIndex(array('parent_object_identity_id'));
$table->addForeignKeyConstraint($table, array('parent_object_identity_id'), array('id'), array('onDelete' => 'RESTRICT', 'onUpdate' => 'RESTRICT')); $table->addForeignKeyConstraint($table, array('parent_object_identity_id'), array('id'));
} }
/** /**