cvs: pear /MDB2_Schema/MDB2/Schema Parser.php

ifeghali Sat Aug 19 10:53:06 2006 UTC Modified files: /pear/MDB2_Schema/MDB2/Schema Parser.php Log: - updated validate's methods call http://cvs.php.net/viewvc.cgi/pear/MDB2_Schema/MDB2/Schema/Parser.php?r1=1.44&r2=1.45&diff_format=u Index: pear/MDB2_Schema/MDB2/Schema/Parser.php diff -u pear/MDB2_Schema/MDB2/Schema/Parser.php:1.44 pear/MDB2_Schema/MDB2/Schema/Parser.php:1.45 --- pear/MDB2_Schema/MDB2/Schema/Parser.php:1.44 Fri Aug 18 00:42:09 2006 +++ pear/MDB2_Schema/MDB2/Schema/Parser.php Sat Aug 19 10:53:06 2006 @@ -42,7 +42,7 @@ // | Author: Christian Dickmann <dickmann@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Parser.php,v 1.44 2006/08/18 00:42:09 ifeghali Exp $ +// $Id: Parser.php,v 1.45 2006/08/19 10:53:06 ifeghali Exp $ // require_once 'XML/Parser.php'; @@ -250,7 +250,7 @@ case 'database-table-initialization-insert': case 'database-table-initialization-delete': case 'database-table-initialization-update': - $result = $this->val->validateDML($this, $xp); + $result = $this->val->validateDML($this->table, $this->init, $xp); break; /* One level simulation of expression-function recursion */ @@ -271,33 +271,33 @@ /* Table definition */ case 'database-table': - $result = $this->val->validateTable($this, $xp); + $result = $this->val->validateTable($this->database_definition['tables'], $this->table, $this->table_name, $this->fail_on_invalid_names, $xp); break; case 'database-table-name': - $result = $this->val->validateTableName($this, $xp); + $result = $this->val->validateTableName($this->table, $this->table_name, $this->structure['tables'], $xp); break; /* Field declaration */ case 'database-table-declaration-field': - $result = $this->val->validateField($this, $xp); + $result = $this->val->validateField($this->table['fields'], $this->field, $this->field_name, $this->force_defaults, $this->valid_types, $this->fail_on_invalid_names, $xp); break; /* Index declaration */ case 'database-table-declaration-index': - $result = $this->val->validateIndex($this, $xp); + $result = $this->val->validateIndex($this->table['indexes'], $this->index, $this->index_name, $xp); break; case 'database-table-declaration-index-field': - $result = $this->val->validateIndexField($this, $xp); + $result = $this->val->validateIndexField($this->index['fields'], $this->field, $this->field_name, $xp); break; /* Sequence declaration */ case 'database-sequence': - $result = $this->val->validateSequence($this, $xp); + $result = $this->val->validateSequence($this->database_definition['sequences'], $this->sequence, $this->sequence_name, $this->fail_on_invalid_names, $xp); break; /* End of File */ case 'database': - $result = $this->val->validateDatabase($this, $xp); + $result = $this->val->validateDatabase($this->database_definition, $this->error, $this->fail_on_invalid_names, $xp); break; }