Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merged branch beberlei/RevertDbalAcl (PR #5253)

Commits
-------

1b5ad17 Revert "Removed MySQL-exclusive usage of unsigned integer from table creation"

Discussion
----------

[Security][DBAL] Revert MySQL unsigned removal

Revert "Removed MySQL-exclusive usage of unsigned integer from table creation"

This reverts commit 57694aaa94ec0118f516e8962be2f018c36d2011.

The problem is underlying in Doctrine DBAL change tracking and should
either be fixed or ignored there.

I opened a ticket on Doctrine Jira http://doctrine-project.org/jira/browse/DBAL-322

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

by fabpot at 2012-08-14T06:40:47Z

I will merge this PR after we have a release of DBAL that includes the fix for DBAL-322.

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

by acasademont at 2012-08-20T08:01:48Z

This was already fixed 2 weeks ago in doctrine/dbal#183 so i guess this can be closed

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

by acasademont at 2012-08-20T08:02:06Z

merged i mean
  • Loading branch information...
commit dc6d2632e5e0cea6cd9d86b4bb799c1dd9fc4786 2 parents df739ce + 6033ef5
@fabpot fabpot authored
Showing with 12 additions and 12 deletions.
  1. +12 −12 Acl/Dbal/Schema.php
View
24 Acl/Dbal/Schema.php
@@ -66,7 +66,7 @@ public function addToSchema(BaseSchema $schema)
protected function addClassTable()
{
$table = $this->createTable($this->options['class_table_name']);
- $table->addColumn('id', 'integer', array('autoincrement' => 'auto'));
+ $table->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => 'auto'));
$table->addColumn('class_type', 'string', array('length' => 200));
$table->setPrimaryKey(array('id'));
$table->addUniqueIndex(array('class_type'));
@@ -79,12 +79,12 @@ protected function addEntryTable()
{
$table = $this->createTable($this->options['entry_table_name']);
- $table->addColumn('id', 'integer', array('autoincrement' => 'auto'));
- $table->addColumn('class_id', 'integer');
- $table->addColumn('object_identity_id', 'integer', array('notnull' => false));
+ $table->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => 'auto'));
+ $table->addColumn('class_id', 'integer', array('unsigned' => true));
+ $table->addColumn('object_identity_id', 'integer', array('unsigned' => true, 'notnull' => false));
$table->addColumn('field_name', 'string', array('length' => 50, 'notnull' => false));
- $table->addColumn('ace_order', 'smallint');
- $table->addColumn('security_identity_id', 'integer');
+ $table->addColumn('ace_order', 'smallint', array('unsigned' => true));
+ $table->addColumn('security_identity_id', 'integer', array('unsigned' => true));
$table->addColumn('mask', 'integer');
$table->addColumn('granting', 'boolean');
$table->addColumn('granting_strategy', 'string', array('length' => 30));
@@ -107,10 +107,10 @@ protected function addObjectIdentitiesTable()
{
$table = $this->createTable($this->options['oid_table_name']);
- $table->addColumn('id', 'integer', array('autoincrement' => 'auto'));
- $table->addColumn('class_id', 'integer');
+ $table->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => 'auto'));
+ $table->addColumn('class_id', 'integer', array('unsigned' => true));
$table->addColumn('object_identifier', 'string', array('length' => 100));
- $table->addColumn('parent_object_identity_id', 'integer', array('notnull' => false));
+ $table->addColumn('parent_object_identity_id', 'integer', array('unsigned' => true, 'notnull' => false));
$table->addColumn('entries_inheriting', 'boolean');
$table->setPrimaryKey(array('id'));
@@ -127,8 +127,8 @@ protected function addObjectIdentityAncestorsTable()
{
$table = $this->createTable($this->options['oid_ancestors_table_name']);
- $table->addColumn('object_identity_id', 'integer');
- $table->addColumn('ancestor_id', 'integer');
+ $table->addColumn('object_identity_id', 'integer', array('unsigned' => true));
+ $table->addColumn('ancestor_id', 'integer', array('unsigned' => true));
$table->setPrimaryKey(array('object_identity_id', 'ancestor_id'));
@@ -144,7 +144,7 @@ protected function addSecurityIdentitiesTable()
{
$table = $this->createTable($this->options['sid_table_name']);
- $table->addColumn('id', 'integer', array('autoincrement' => 'auto'));
+ $table->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => 'auto'));
$table->addColumn('identifier', 'string', array('length' => 200));
$table->addColumn('username', 'boolean');
Please sign in to comment.
Something went wrong with that request. Please try again.