Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

ZF2-511 Updated refactored names and other fixes #2335

Merged
merged 4 commits into from Sep 13, 2012

Conversation

Projects
None yet
2 participants
Contributor

kpieters commented Sep 11, 2012

  • Updated files to new names that are refactored in earlier commits.
  • Removed double declaration of $first
  • Removed duplicate keys + values

@weierophinney weierophinney commented on the diff Sep 13, 2012

library/Zend/Db/Metadata/Source/AbstractSource.php
@@ -361,9 +361,6 @@ public function getConstraint($constraintName, $table, $schema = null)
'referenced_table_schema' => 'setReferencedTableSchema',
'referenced_table_name' => 'setReferencedTableName',
'referenced_columns' => 'setReferencedColumns',
- 'match_option' => 'setMatchOption',
- 'update_rule' => 'setUpdateRule',
- 'delete_rule' => 'setDeleteRule',
@weierophinney

weierophinney Sep 13, 2012

Owner

Why are these removed? From what I can see, they map to valid methods in the constraint object.

@kpieters

kpieters Sep 14, 2012

Contributor

Cause it is declared twice.

Line 357 - 359 are exactly the same as 364 - 366.

See code block below.

foreach (array(
'constraint_type' => 'setType',
'match_option' => 'setMatchOption',
'update_rule' => 'setUpdateRule',
'delete_rule' => 'setDeleteRule',
'columns' => 'setColumns',
'referenced_table_schema' => 'setReferencedTableSchema',
'referenced_table_name' => 'setReferencedTableName',
'referenced_columns' => 'setReferencedColumns',
'match_option' => 'setMatchOption',
'update_rule' => 'setUpdateRule',
'delete_rule' => 'setDeleteRule',
'check_clause' => 'setCheckClause',
)

@weierophinney weierophinney added a commit that referenced this pull request Sep 13, 2012

@weierophinney weierophinney [#2335] Re-added constraint types
- match_option, update_rule, and delete_rule, as they're referenced by
  the ConstraintObject
dbd6c30

@weierophinney weierophinney merged commit c154173 into zendframework:master Sep 13, 2012

1 check passed

default The Travis build passed
Details
Owner

weierophinney commented Sep 13, 2012

Restored the removed constraints from Db\Metadata, and merged to release and master branches.

@ghost ghost assigned weierophinney Sep 13, 2012

@zfbot zfbot referenced this pull request Sep 28, 2012

Closed

Random Errors #2547

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment