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.

1 files changed, 5 insertions, 3 deletions

diff --git a/Acl/Dbal/Schema.php b/Acl/Dbal/Schema.php
index 97372f0..010a51e 100644
--- a/Acl/Dbal/Schema.php
+++ b/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 @@ final class Schema extends BaseSchema
      * 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 @@ final class Schema extends BaseSchema
         $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'));
     }
 
     /**