From: Andrey Kutejko Date: Sat, 3 Aug 2013 11:49:59 +0000 (+0300) Subject: cleanup X-Git-Tag: 0.5~85 X-Git-Url: https://git.andy128k.dev/?a=commitdiff_plain;h=7d7298363cd87f31637325029876af4f8934dba9;p=ipf.git cleanup --- diff --git a/ipf/orm/relation.php b/ipf/orm/relation.php index 8c43bcc..da16b0e 100644 --- a/ipf/orm/relation.php +++ b/ipf/orm/relation.php @@ -48,10 +48,11 @@ abstract class IPF_ORM_Relation implements ArrayAccess public function hasConstraint() { - return ($this->definition['constraint'] || - ($this->definition['onUpdate']) || - ($this->definition['onDelete'])); + return $this->definition['constraint'] || + $this->definition['onUpdate'] || + $this->definition['onDelete']; } + public function isDeferred() { return $this->definition['deferred']; @@ -181,4 +182,5 @@ abstract class IPF_ORM_Relation implements ArrayAccess $r[] = ""; return implode("\n", $r); } -} \ No newline at end of file +} + diff --git a/ipf/orm/relation/localkey.php b/ipf/orm/relation/localkey.php index ebe8e66..635402b 100644 --- a/ipf/orm/relation/localkey.php +++ b/ipf/orm/relation/localkey.php @@ -35,4 +35,5 @@ class IPF_ORM_Relation_LocalKey extends IPF_ORM_Relation } return $alias . '.' . $this->definition['foreign'] . ' = ?'; } -} \ No newline at end of file +} + diff --git a/ipf/orm/table.php b/ipf/orm/table.php index fcf2e23..f09b9e5 100644 --- a/ipf/orm/table.php +++ b/ipf/orm/table.php @@ -197,11 +197,6 @@ class IPF_ORM_Table extends IPF_ORM_Configurable implements Countable } } - public function addForeignKey(array $definition) - { - $this->_options['foreignKeys'][] = $definition; - } - public function addCheckConstraint($definition, $name) { if (is_string($name)) {