Skip to content

Commit 1dd1532

Browse files
committed
merged branch beberlei/RevertDbalAcl (PR symfony#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 57694aa. 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
2 parents 0919361 + 1b5ad17 commit 1dd1532

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/Symfony/Component/Security/Acl/Dbal/Schema.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function addToSchema(BaseSchema $schema)
6666
protected function addClassTable()
6767
{
6868
$table = $this->createTable($this->options['class_table_name']);
69-
$table->addColumn('id', 'integer', array('autoincrement' => 'auto'));
69+
$table->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => 'auto'));
7070
$table->addColumn('class_type', 'string', array('length' => 200));
7171
$table->setPrimaryKey(array('id'));
7272
$table->addUniqueIndex(array('class_type'));
@@ -79,12 +79,12 @@ protected function addEntryTable()
7979
{
8080
$table = $this->createTable($this->options['entry_table_name']);
8181

82-
$table->addColumn('id', 'integer', array('autoincrement' => 'auto'));
83-
$table->addColumn('class_id', 'integer');
84-
$table->addColumn('object_identity_id', 'integer', array('notnull' => false));
82+
$table->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => 'auto'));
83+
$table->addColumn('class_id', 'integer', array('unsigned' => true));
84+
$table->addColumn('object_identity_id', 'integer', array('unsigned' => true, 'notnull' => false));
8585
$table->addColumn('field_name', 'string', array('length' => 50, 'notnull' => false));
86-
$table->addColumn('ace_order', 'smallint');
87-
$table->addColumn('security_identity_id', 'integer');
86+
$table->addColumn('ace_order', 'smallint', array('unsigned' => true));
87+
$table->addColumn('security_identity_id', 'integer', array('unsigned' => true));
8888
$table->addColumn('mask', 'integer');
8989
$table->addColumn('granting', 'boolean');
9090
$table->addColumn('granting_strategy', 'string', array('length' => 30));
@@ -107,10 +107,10 @@ protected function addObjectIdentitiesTable()
107107
{
108108
$table = $this->createTable($this->options['oid_table_name']);
109109

110-
$table->addColumn('id', 'integer', array('autoincrement' => 'auto'));
111-
$table->addColumn('class_id', 'integer');
110+
$table->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => 'auto'));
111+
$table->addColumn('class_id', 'integer', array('unsigned' => true));
112112
$table->addColumn('object_identifier', 'string', array('length' => 100));
113-
$table->addColumn('parent_object_identity_id', 'integer', array('notnull' => false));
113+
$table->addColumn('parent_object_identity_id', 'integer', array('unsigned' => true, 'notnull' => false));
114114
$table->addColumn('entries_inheriting', 'boolean');
115115

116116
$table->setPrimaryKey(array('id'));
@@ -127,8 +127,8 @@ protected function addObjectIdentityAncestorsTable()
127127
{
128128
$table = $this->createTable($this->options['oid_ancestors_table_name']);
129129

130-
$table->addColumn('object_identity_id', 'integer');
131-
$table->addColumn('ancestor_id', 'integer');
130+
$table->addColumn('object_identity_id', 'integer', array('unsigned' => true));
131+
$table->addColumn('ancestor_id', 'integer', array('unsigned' => true));
132132

133133
$table->setPrimaryKey(array('object_identity_id', 'ancestor_id'));
134134

@@ -144,7 +144,7 @@ protected function addSecurityIdentitiesTable()
144144
{
145145
$table = $this->createTable($this->options['sid_table_name']);
146146

147-
$table->addColumn('id', 'integer', array('autoincrement' => 'auto'));
147+
$table->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => 'auto'));
148148
$table->addColumn('identifier', 'string', array('length' => 200));
149149
$table->addColumn('username', 'boolean');
150150

0 commit comments

Comments
 (0)