diff --git a/src/Propel/Generator/Builder/Om/ObjectBuilder.php b/src/Propel/Generator/Builder/Om/ObjectBuilder.php index 4de9e5f384..da7a6ece48 100644 --- a/src/Propel/Generator/Builder/Om/ObjectBuilder.php +++ b/src/Propel/Generator/Builder/Om/ObjectBuilder.php @@ -150,7 +150,7 @@ protected function getTemporalFormatter(Column $column) * Returns the type-casted and stringified default value for the specified * Column. This only works for scalar default values currently. * - * @param Column $column + * @param Column $column * @throws EngineException * @return string */ @@ -834,7 +834,7 @@ public function addTemporalAccessorOpen(&$script, Column $column) /** * Gets accessor lazy loaded snippets. * - * @param Column $column + * @param Column $column * @return string */ protected function getAccessorLazyLoadSnippet(Column $column) @@ -3007,7 +3007,7 @@ protected function addFKMethods(&$script) /** * Adds the class attributes that are needed to store fkey related objects. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $fk */ protected function addFKAttributes(&$script, ForeignKey $fk) @@ -3025,7 +3025,7 @@ protected function addFKAttributes(&$script, ForeignKey $fk) /** * Adds the mutator (setter) method for setting an fkey related object. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $fk */ protected function addFKMutator(&$script, ForeignKey $fk) @@ -3097,7 +3097,7 @@ public function set".$this->getFKPhpNameAffix($fk, false)."($className \$v = nul /** * Adds the accessor (getter) method for getting an fkey related object. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $fk */ protected function addFKAccessor(&$script, ForeignKey $fk) @@ -3195,7 +3195,7 @@ public function get".$this->getFKPhpNameAffix($fk, false)."(ConnectionInterface * Adds a convenience method for setting a related object by specifying the primary key. * This can be used in conjunction with the getPrimaryKey() for systems where nothing is known * about the actual objects being related. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $fk */ protected function addFKByKeyMutator(&$script, ForeignKey $fk) @@ -3253,7 +3253,7 @@ public function set".$methodAffix."Key(\$key) /** * Adds the method that fetches fkey-related (referencing) objects but also joins in data from another table. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $refFK */ protected function addRefFKGetJoinMethods(&$script, ForeignKey $refFK) @@ -3324,7 +3324,7 @@ public function get".$relCol."Join".$relCol2."(\$criteria = null, \$con = null, * Adds the attributes used to store objects that have referrer fkey relationships to this object. * protected collVarName; * private lastVarNameCriteria = null; - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $refFK */ protected function addRefFKAttributes(&$script, ForeignKey $refFK) @@ -3412,7 +3412,7 @@ public function initRelation(\$relationName) /** * Adds the method that clears the referrer fkey collection. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $refFK */ protected function addRefFKClear(&$script, ForeignKey $refFK) @@ -3439,7 +3439,7 @@ public function clear$relCol() /** * Adds the method that initializes the referrer fkey collection. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $refFK */ protected function addRefFKInit(&$script, ForeignKey $refFK) @@ -3473,7 +3473,7 @@ public function init$relCol(\$overrideExisting = true) /** * Adds the method that adds an object into the referrer fkey collection. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $refFK */ protected function addRefFKAdd(&$script, ForeignKey $refFK) @@ -3515,7 +3515,7 @@ public function add".$this->getRefFKPhpNameAffix($refFK, false)."($className \$l /** * Adds the method that returns the size of the referrer fkey collection. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $refFK */ protected function addRefFKCount(&$script, ForeignKey $refFK) @@ -3566,7 +3566,7 @@ public function count{$relCol}(Criteria \$criteria = null, \$distinct = false, C /** * Adds the method that returns the referrer fkey collection. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $refFK */ protected function addRefFKGet(&$script, ForeignKey $refFK) @@ -3701,7 +3701,7 @@ public function set{$relatedName}(Collection \${$inputCollection}, ConnectionInt } /** - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $refFK */ protected function addRefFKDoAdd(&$script, $refFK) @@ -3723,7 +3723,7 @@ protected function doAdd{$relatedObjectClassName}(\${$lowerRelatedObjectClassNam } /** - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $refFK */ protected function addRefFKRemove(&$script, $refFK) @@ -3771,7 +3771,7 @@ public function remove{$relatedObjectClassName}(\${$lowerRelatedObjectClassName} /** * Adds the method that gets a one-to-one related referrer fkey. * This is for one-to-one relationship special case. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $refFK */ protected function addPKRefFKGet(&$script, ForeignKey $refFK) @@ -3969,7 +3969,7 @@ protected function addCrossFKMethods(&$script) /** * Adds the method that clears the referrer fkey collection. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $crossFK */ protected function addCrossFKClear(&$script, ForeignKey $crossFK) @@ -3998,7 +3998,7 @@ public function clear{$relCol}() /** * Adds the method that clears the referrer fkey collection. * - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $refFK */ protected function addRefFKPartial(&$script, ForeignKey $refFK) @@ -4019,7 +4019,7 @@ public function resetPartial{$relCol}(\$v = true) /** * Adds the method that initializes the referrer fkey collection. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $crossFK */ protected function addCrossFKInit(&$script, ForeignKey $crossFK) @@ -4178,7 +4178,7 @@ public function count{$relatedName}(\$criteria = null, \$distinct = false, Conne /** * Adds the method that adds an object into the referrer fkey collection. - * @param string &$script The script will be modified in this method. + * @param string &$script The script will be modified in this method. * @param ForeignKey $refFK * @param ForeignKey $crossFK */ @@ -4258,7 +4258,7 @@ protected function doAdd{$relatedObjectClassName}(\${$lowerRelatedObjectClassNam /** * Adds the method that remove an object from the referrer fkey collection. - * @param string $script The script will be modified in this method. + * @param string $script The script will be modified in this method. * @param ForeignKey $refFK * @param ForeignKey $crossFK */ diff --git a/src/Propel/Generator/Builder/Om/TableMapBuilder.php b/src/Propel/Generator/Builder/Om/TableMapBuilder.php index 46aab62dda..b3a00fad28 100644 --- a/src/Propel/Generator/Builder/Om/TableMapBuilder.php +++ b/src/Propel/Generator/Builder/Om/TableMapBuilder.php @@ -727,8 +727,8 @@ public function addClearRelatedInstancePool() /** * Checks whether any registered behavior on that table has a modifier for a hook - * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave" - * @param null $modifier + * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave" + * @param null $modifier * @return boolean */ public function hasBehaviorModifier($hookName, $modifier = null) diff --git a/src/Propel/Generator/Command/DatabaseReverseCommand.php b/src/Propel/Generator/Command/DatabaseReverseCommand.php index 025d327bfe..7112ee1fb3 100644 --- a/src/Propel/Generator/Command/DatabaseReverseCommand.php +++ b/src/Propel/Generator/Command/DatabaseReverseCommand.php @@ -71,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $manager->setWorkingDirectory($input->getOption('output-dir')); list(, $dsn, $infos) = $this->parseConnection('connection=' . $input->getArgument('connection')); - + $manager->setConnection(array_merge(array('dsn' => $dsn), $infos)); $manager->setDatabaseName($input->getOption('database-name')); diff --git a/src/Propel/Generator/Command/SqlInsertCommand.php b/src/Propel/Generator/Command/SqlInsertCommand.php index 19a4df6276..8e7eb462bf 100644 --- a/src/Propel/Generator/Command/SqlInsertCommand.php +++ b/src/Propel/Generator/Command/SqlInsertCommand.php @@ -15,7 +15,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\Output; use Propel\Generator\Manager\SqlManager; -use Propel\Generator\Exception\InvalidArgumentException; /** * @author William Durand diff --git a/src/Propel/Generator/Model/Column.php b/src/Propel/Generator/Model/Column.php index 2125d8d016..9540ba66b2 100644 --- a/src/Propel/Generator/Model/Column.php +++ b/src/Propel/Generator/Model/Column.php @@ -626,7 +626,7 @@ public function addInheritance($inheritance) /** * Returns the inheritance type. - * + * * @return string */ public function getInheritanceType() @@ -636,7 +636,7 @@ public function getInheritanceType() /** * Returns the inheritance list. - * + * * @return Inheritance[] */ public function getInheritanceList() @@ -1210,7 +1210,7 @@ public function getDefaultValueString() /** * Sets a string that will give this column a default value. * - * @param ColumnDefaultValue|scalar $defaultValue The column's default value + * @param ColumnDefaultValue|scalar $defaultValue The column's default value * @return Column */ public function setDefaultValue($defaultValue) diff --git a/src/Propel/Generator/Model/ConstraintNameGenerator.php b/src/Propel/Generator/Model/ConstraintNameGenerator.php index e24a3df2f2..4e28ac90c3 100644 --- a/src/Propel/Generator/Model/ConstraintNameGenerator.php +++ b/src/Propel/Generator/Model/ConstraintNameGenerator.php @@ -34,7 +34,7 @@ class ConstraintNameGenerator implements NameGeneratorInterface * of this constraint. * * @see NameGenerator - * @param array $inputs An array of input parameters + * @param array $inputs An array of input parameters * @throws EngineException */ public function generateName($inputs) diff --git a/src/Propel/Generator/Model/Database.php b/src/Propel/Generator/Model/Database.php index 9582c35836..3b85750c79 100644 --- a/src/Propel/Generator/Model/Database.php +++ b/src/Propel/Generator/Model/Database.php @@ -160,7 +160,7 @@ public function setPlatform(PlatformInterface $platform = null) /** * Returns the max column name's length. - * + * * @return integer */ public function getMaxColumnNameLength() diff --git a/src/Propel/Generator/Model/Diff/TableDiff.php b/src/Propel/Generator/Model/Diff/TableDiff.php index a982669e51..aa20cb05d4 100644 --- a/src/Propel/Generator/Model/Diff/TableDiff.php +++ b/src/Propel/Generator/Model/Diff/TableDiff.php @@ -248,7 +248,7 @@ public function getAddedColumns() /** * Returns an added column by its name. * - * @param string $columnName + * @param string $columnName * @return Column|null */ public function getAddedColumn($columnName) diff --git a/src/Propel/Generator/Model/Index.php b/src/Propel/Generator/Model/Index.php index 499bd6e0f2..6314d76f99 100644 --- a/src/Propel/Generator/Model/Index.php +++ b/src/Propel/Generator/Model/Index.php @@ -28,7 +28,7 @@ class Index extends MappingModel /** * The Table instance. - * + * * @var Table */ protected $table; diff --git a/src/Propel/Generator/Model/MappingModel.php b/src/Propel/Generator/Model/MappingModel.php index 93de54737a..1b334959b9 100644 --- a/src/Propel/Generator/Model/MappingModel.php +++ b/src/Propel/Generator/Model/MappingModel.php @@ -174,7 +174,7 @@ public function getVendorInfoForType($type) /** * Returns the list of all vendor information. - * + * * @return VendorInfo[] */ public function getVendorInformation() diff --git a/src/Propel/Generator/Model/Schema.php b/src/Propel/Generator/Model/Schema.php index dbbad82696..04bf4dab7f 100644 --- a/src/Propel/Generator/Model/Schema.php +++ b/src/Propel/Generator/Model/Schema.php @@ -311,7 +311,7 @@ public function countTables() public function toString() { $dumper = new XmlDumper(); - + return $dumper->dumpSchema($this); } diff --git a/src/Propel/Generator/Model/ScopedMappingModel.php b/src/Propel/Generator/Model/ScopedMappingModel.php index db3a9137be..6127f36068 100644 --- a/src/Propel/Generator/Model/ScopedMappingModel.php +++ b/src/Propel/Generator/Model/ScopedMappingModel.php @@ -37,7 +37,7 @@ public function __construct() /** * Returns whether or not the package has been overriden. - * + * * @return boolean */ public function isPackageOverriden() diff --git a/src/Propel/Generator/Model/Table.php b/src/Propel/Generator/Model/Table.php index ec34c6695c..85c6b026ad 100644 --- a/src/Propel/Generator/Model/Table.php +++ b/src/Propel/Generator/Model/Table.php @@ -523,7 +523,7 @@ public function setBaseClass($class) /** * Adds a new column to the table. * - * @param Column|array $col + * @param Column|array $col * @throws EngineException * @return Column */ @@ -563,7 +563,7 @@ public function addColumn($col) /** * Adds several columns at once. - * + * * @param Column[] $columns An array of Column instance */ public function addColumns(array $columns) @@ -576,7 +576,7 @@ public function addColumns(array $columns) /** * Removes a column from the table. * - * @param Column|string $column The Column or its name + * @param Column|string $column The Column or its name * @throws EngineException */ public function removeColumn($column) @@ -625,7 +625,7 @@ public function adjustColumnPositions() /** * Adds a new foreign key to this table. * - * @param ForeignKey|array $foreignKey The foreign key mapping + * @param ForeignKey|array $foreignKey The foreign key mapping * @return ForeignKey */ public function addForeignKey($foreignKey) @@ -718,7 +718,7 @@ public function getReferrers() * adds the missing referrers and is non-destructive. * Warning: only use when all the tables were created. * - * @param boolean $throwErrors + * @param boolean $throwErrors * @throws BuildException */ public function setupReferrers($throwErrors = false) @@ -852,7 +852,7 @@ public function requiresTransactionInPostgres() /** * Adds a new parameter for the strategy that generates primary keys. * - * @param IdMethodParameter $idMethodParameter + * @param IdMethodParameter $idMethodParameter * @return IdMethodParameter */ public function addIdMethodParameter($idMethodParameter) @@ -1163,7 +1163,7 @@ public function setPhpName($phpName) /** * Returns the auto generated PHP name value for a given name. * - * @param string $name + * @param string $name * @return string */ private function buildPhpName($name) @@ -1306,7 +1306,7 @@ public function isReadOnly() /** * Makes this database in read-only mode. - * + * * @param boolean $flag True by default */ public function setReadOnly($flag = true) @@ -1497,7 +1497,7 @@ public function getForeignKeys() /** * Returns a Collection of parameters relevant for the chosen * id generation method. - * + * * @return IdMethodParameter[] */ public function getIdMethodParameters() @@ -1529,7 +1529,7 @@ public function getUnices() * Checks if $keys are a unique constraint in the table. * (through primaryKey, through a regular unices constraints or for single keys when it has isUnique=true) * - * @param Column[]|string[] $keys + * @param Column[]|string[] $keys * @return boolean */ public function isUnique(array $keys) @@ -1762,7 +1762,7 @@ public function isForReferenceOnly() /** * Returns whether or not to determine if code/sql gets created for this table. * Table will be skipped, if set to true. - * + * * @param boolean $flag */ public function setForReferenceOnly($flag = true) diff --git a/src/Propel/Generator/Reverse/PgsqlSchemaParser.php b/src/Propel/Generator/Reverse/PgsqlSchemaParser.php index 1d01b820a8..99d29edd5a 100644 --- a/src/Propel/Generator/Reverse/PgsqlSchemaParser.php +++ b/src/Propel/Generator/Reverse/PgsqlSchemaParser.php @@ -94,7 +94,7 @@ protected function getTypeMapping() /** * Parses a database schema. * - * @param Database $database + * @param Database $database * @return integer */ public function parse(Database $database) @@ -174,8 +174,8 @@ public function parse(Database $database) /** * Adds Columns to the specified table. * - * @param Table $table The Table model class to add columns to. - * @param int $oid The table OID + * @param Table $table The Table model class to add columns to. + * @param int $oid The table OID */ protected function addColumns(Table $table, $oid) { diff --git a/src/Propel/Generator/Schema/Dumper/DumperInterface.php b/src/Propel/Generator/Schema/Dumper/DumperInterface.php index f2bd2259bc..2cc8e00463 100644 --- a/src/Propel/Generator/Schema/Dumper/DumperInterface.php +++ b/src/Propel/Generator/Schema/Dumper/DumperInterface.php @@ -10,17 +10,17 @@ interface DumperInterface /** * Dumps a Database model into a text formatted version. * - * @param Database $database The database model - * @return string The dumped formatted output (XML, YAML, CSV...) + * @param Database $database The database model + * @return string The dumped formatted output (XML, YAML, CSV...) */ public function dump(Database $database); /** * Dumps a single Schema model into an XML formatted version. * - * @param Schema $schema The schema model - * @param boolean $doFinalInitialization Whether or not to validate the schema - * @return string The dumped formatted output (XML, YAML, CSV...) + * @param Schema $schema The schema model + * @param boolean $doFinalInitialization Whether or not to validate the schema + * @return string The dumped formatted output (XML, YAML, CSV...) */ public function dumpSchema(Schema $schema, $doFinalInitialization = true); } diff --git a/src/Propel/Generator/Schema/Dumper/XmlDumper.php b/src/Propel/Generator/Schema/Dumper/XmlDumper.php index 873b9c94f1..345a301eb8 100644 --- a/src/Propel/Generator/Schema/Dumper/XmlDumper.php +++ b/src/Propel/Generator/Schema/Dumper/XmlDumper.php @@ -56,8 +56,8 @@ public function __construct(\DOMDocument $document = null) /** * Dumps a single Database model into an XML formatted version. * - * @param Database $database The database model - * @return string The dumped XML formatted output + * @param Database $database The database model + * @return string The dumped XML formatted output */ public function dump(Database $database) { @@ -69,8 +69,8 @@ public function dump(Database $database) /** * Dumps a single Schema model into an XML formatted version. * - * @param Schema $schema The schema object - * @param boolean $doFinalInitialization Whether or not to validate the schema + * @param Schema $schema The schema object + * @param boolean $doFinalInitialization Whether or not to validate the schema * @return string */ public function dumpSchema(Schema $schema, $doFinalInitialization = true) @@ -487,8 +487,8 @@ private function appendIndexNode(Index $index, \DOMNode $parentNode) /** * Appends the generated XML node to its parent node. * - * @param Unique $unique The Unique model instance - * @param \DOMNode $parentNode The parent DOMNode object + * @param Unique $unique The Unique model instance + * @param \DOMNode $parentNode The parent DOMNode object */ private function appendUniqueIndexNode(Unique $index, \DOMNode $parentNode) { @@ -498,9 +498,9 @@ private function appendUniqueIndexNode(Unique $index, \DOMNode $parentNode) /** * Appends a generice or XML node to its parent node. * - * @param string $nodeType The node type (index or unique) - * @param Index $index The Index model instance - * @param \DOMNode $parentNode The parent DOMNode object + * @param string $nodeType The node type (index or unique) + * @param Index $index The Index model instance + * @param \DOMNode $parentNode The parent DOMNode object */ private function appendGenericIndexNode($nodeType, Index $index, \DOMNode $parentNode) { diff --git a/src/Propel/Runtime/Connection/ConnectionWrapper.php b/src/Propel/Runtime/Connection/ConnectionWrapper.php index df170eb09a..2260571dc6 100644 --- a/src/Propel/Runtime/Connection/ConnectionWrapper.php +++ b/src/Propel/Runtime/Connection/ConnectionWrapper.php @@ -644,7 +644,7 @@ public function log($msg) do { $callingMethod = $backtrace[$i]['function']; $i++; - } while($callingMethod == "log" && $i < $stackSize); + } while ($callingMethod == "log" && $i < $stackSize); if (!$msg || !$this->isLogEnabledForMethod($callingMethod)) { return; diff --git a/src/Propel/Runtime/ServiceContainer/ServiceContainerInterface.php b/src/Propel/Runtime/ServiceContainer/ServiceContainerInterface.php index 466d709151..0f900b087a 100644 --- a/src/Propel/Runtime/ServiceContainer/ServiceContainerInterface.php +++ b/src/Propel/Runtime/ServiceContainer/ServiceContainerInterface.php @@ -143,7 +143,7 @@ public function getProfiler(); /** * Get a logger for a given datasource, or the default logger. * - * @param string $name + * @param string $name * @return LoggerInterface */ public function getLogger($name = 'defaultLogger'); diff --git a/tests/Propel/Tests/Generator/Model/Diff/TableDiffTest.php b/tests/Propel/Tests/Generator/Model/Diff/TableDiffTest.php index eb410d5022..fbc0326fa9 100644 --- a/tests/Propel/Tests/Generator/Model/Diff/TableDiffTest.php +++ b/tests/Propel/Tests/Generator/Model/Diff/TableDiffTest.php @@ -9,7 +9,6 @@ use Propel\Generator\Model\ForeignKey; use Propel\Generator\Model\Index; use Propel\Generator\Model\Table; -use Propel\Generator\Model\Unique; use Propel\Generator\Platform\DefaultPlatform; class TableDiffTest extends \PHPUnit_Framework_TestCase @@ -20,7 +19,7 @@ public function testDefaultObjectState() $toTable = new Table('article'); $diff = $this->createTableDiff($fromTable, $toTable); - + $this->assertSame($fromTable, $diff->getFromTable()); $this->assertSame($toTable, $diff->getToTable()); $this->assertFalse($diff->hasAddedColumns()); @@ -296,7 +295,7 @@ public function testReverseDiffHasModifiedColumns() $diff = $this->createTableDiff(); $diff->addModifiedColumn('title', $columnDiff); - + $reverseDiff = $diff->getReverseDiff(); $this->assertTrue($reverseDiff->hasModifiedColumns()); $this->assertEquals([ 'title' => $reverseColumnDiff ], $reverseDiff->getModifiedColumns()); @@ -464,7 +463,7 @@ public function testReverseDiffHasModifiedFks() $this->assertTrue($reverseDiff->hasModifiedFks()); $this->assertSame([ 'fk_1' => [ $toFk, $fromFk ]], $reverseDiff->getModifiedFks()); } - + private function createTableDiff(Table $fromTable = null, Table $toTable = null) { if (null === $fromTable) { diff --git a/tests/Propel/Tests/Resources/blog-schema.php b/tests/Propel/Tests/Resources/blog-schema.php index f18564e310..51caec19f4 100644 --- a/tests/Propel/Tests/Resources/blog-schema.php +++ b/tests/Propel/Tests/Resources/blog-schema.php @@ -10,4 +10,3 @@ $schema->addDatabase($database); return $schema; - diff --git a/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaTest.php b/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaTest.php index a2af82f366..7cd78e4d17 100644 --- a/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaTest.php +++ b/tests/Propel/Tests/Runtime/ActiveQuery/CriteriaTest.php @@ -1114,7 +1114,7 @@ public function testGroupBy() $result = $c->createSelectSql($params); - if ($this->runningOnPostgreSQL()){ + if ($this->runningOnPostgreSQL()) { $sql = 'SELECT book.ID, book.TITLE, book.ISBN, book.PRICE, book.PUBLISHER_ID, book.AUTHOR_ID, COUNT(review.ID) AS Count FROM book LEFT JOIN review ON (book.ID=review.BOOK_ID) GROUP BY book.ID,book.TITLE,book.ISBN,book.PRICE,book.PUBLISHER_ID,book.AUTHOR_ID'; } else { $sql = $this->getSql('SELECT book.ID, book.TITLE, book.ISBN, book.PRICE, book.PUBLISHER_ID, book.AUTHOR_ID, COUNT(review.ID) AS Count FROM `book` LEFT JOIN `review` ON (book.ID=review.BOOK_ID) GROUP BY book.ID');