Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merged branch gustavopiltcher/master (PR #2858)

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.
  • Loading branch information...
commit 41adf77f0ab66a12202bf123baaf5d1b90e01176 2 parents 6699f4f + a5766bb
@fabpot fabpot authored
Showing with 5 additions and 3 deletions.
  1. +5 −3 Acl/Dbal/Schema.php
View
8 Acl/Dbal/Schema.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Acl\Dbal;
use Doctrine\DBAL\Schema\Schema as BaseSchema;
+use Doctrine\DBAL\Schema\SchemaConfig;
/**
* The schema used for the ACL system.
@@ -26,10 +27,11 @@
* Constructor
*
* @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;
@@ -97,7 +99,7 @@ protected function addObjectIdentitiesTable()
$table->addUniqueIndex(array('object_identifier', 'class_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'));
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.