@@ -13,7 +13,6 @@ |
||
| 13 | 13 | use PDOException; |
| 14 | 14 | use Ibonly\PotatoORM\DatabaseQueryInterface; |
| 15 | 15 | use Ibonly\PotatoORM\ColumnNotExistExeption; |
| 16 | -use Ibonly\PotatoORM\InvalidConnectionException; |
|
| 17 | 16 | use Ibonly\PotatoORM\TableDoesNotExistException; |
| 18 | 17 | |
| 19 | 18 | class DatabaseQuery implements DatabaseQueryInterface |
@@ -39,13 +39,13 @@ discard block |
||
| 39 | 39 | trait Inflector |
| 40 | 40 | { |
| 41 | 41 | /** |
| 42 | - * Pluralizes English nouns. |
|
| 43 | - * |
|
| 44 | - * @access public |
|
| 45 | - * @static |
|
| 46 | - * @param string $word English noun to pluralize |
|
| 47 | - * @return string Plural noun |
|
| 48 | - */ |
|
| 42 | + * Pluralizes English nouns. |
|
| 43 | + * |
|
| 44 | + * @access public |
|
| 45 | + * @static |
|
| 46 | + * @param string $word English noun to pluralize |
|
| 47 | + * @return string Plural noun |
|
| 48 | + */ |
|
| 49 | 49 | public static function pluralize($word) |
| 50 | 50 | { |
| 51 | 51 | $plural = array( |
@@ -102,13 +102,13 @@ discard block |
||
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | /** |
| 105 | - * Singularizes English nouns. |
|
| 106 | - * |
|
| 107 | - * @access public |
|
| 108 | - * @static |
|
| 109 | - * @param string $word English noun to singularize |
|
| 110 | - * @return string Singular noun. |
|
| 111 | - */ |
|
| 105 | + * Singularizes English nouns. |
|
| 106 | + * |
|
| 107 | + * @access public |
|
| 108 | + * @static |
|
| 109 | + * @param string $word English noun to singularize |
|
| 110 | + * @return string Singular noun. |
|
| 111 | + */ |
|
| 112 | 112 | public function singularize($word) |
| 113 | 113 | { |
| 114 | 114 | $singular = array ( |
@@ -9,17 +9,12 @@ |
||
| 9 | 9 | |
| 10 | 10 | namespace Ibonly\PotatoORM; |
| 11 | 11 | |
| 12 | -use PDO; |
|
| 13 | -use Exception; |
|
| 14 | -use PDOException; |
|
| 15 | 12 | use Ibonly\PotatoORM\GetData; |
| 16 | 13 | use Ibonly\PotatoORM\DatabaseQuery; |
| 17 | 14 | use Ibonly\PotatoORM\ModelInterface; |
| 18 | 15 | use Ibonly\PotatoORM\UserNotFoundException; |
| 19 | 16 | use Ibonly\PotatoORM\EmptyDatabaseException; |
| 20 | 17 | use Ibonly\PotatoORM\SaveUserExistException; |
| 21 | -use Ibonly\PotatoORM\ColumnNotExistExeption; |
|
| 22 | -use Ibonly\PotatoORM\InvalidConnectionException; |
|
| 23 | 18 | |
| 24 | 19 | class Model extends DatabaseQuery implements ModelInterface |
| 25 | 20 | { |
@@ -53,8 +53,8 @@ |
||
| 53 | 53 | /** |
| 54 | 54 | * Get the count of the fetch element |
| 55 | 55 | */ |
| 56 | - public function getCount() |
|
| 57 | - { |
|
| 56 | + public function getCount() |
|
| 57 | + { |
|
| 58 | 58 | return sizeof($this->value); |
| 59 | - } |
|
| 59 | + } |
|
| 60 | 60 | } |
| 61 | 61 | \ No newline at end of file |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | interface GetDataInterface |
| 13 | 13 | { |
| 14 | - public function all(); |
|
| 14 | + public function all(); |
|
| 15 | 15 | |
| 16 | 16 | public function allDESC($limit); |
| 17 | 17 | |
@@ -23,5 +23,5 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | public function first(); |
| 25 | 25 | |
| 26 | - public function getCount(); |
|
| 26 | + public function getCount(); |
|
| 27 | 27 | } |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | |
| 12 | 12 | interface RelationshipsInterface |
| 13 | 13 | { |
| 14 | - public function joinClause(); |
|
| 14 | + public function joinClause(); |
|
| 15 | 15 | |
| 16 | 16 | public function whereClause($data, $condition); |
| 17 | 17 | } |
| 18 | 18 | \ No newline at end of file |
@@ -25,36 +25,36 @@ |
||
| 25 | 25 | $i = 0; |
| 26 | 26 | |
| 27 | 27 | if ($data[0]->REFERENCED_TABLE_NAME !== null) { |
| 28 | - $arraySize = count($data); |
|
| 29 | - |
|
| 30 | - foreach($data as $key => $value) { |
|
| 31 | - $output .= ' JOIN '.$value->REFERENCED_TABLE_NAME; |
|
| 32 | - } |
|
| 33 | - foreach($data as $key => $value) { |
|
| 34 | - $i++; |
|
| 35 | - $whereAnd = $i > 1 ? 'AND' : 'WHERE'; |
|
| 36 | - $output .= ' '.$whereAnd.' '.self::getTableName($connection).'.'.$value->COLUMN_NAME.'='.$value->REFERENCED_TABLE_NAME.'.'.$value->REFERENCED_COLUMN_NAME.' '; |
|
| 37 | - } |
|
| 38 | - } else { |
|
| 39 | - $output = false; |
|
| 40 | - } |
|
| 28 | + $arraySize = count($data); |
|
| 29 | + |
|
| 30 | + foreach($data as $key => $value) { |
|
| 31 | + $output .= ' JOIN '.$value->REFERENCED_TABLE_NAME; |
|
| 32 | + } |
|
| 33 | + foreach($data as $key => $value) { |
|
| 34 | + $i++; |
|
| 35 | + $whereAnd = $i > 1 ? 'AND' : 'WHERE'; |
|
| 36 | + $output .= ' '.$whereAnd.' '.self::getTableName($connection).'.'.$value->COLUMN_NAME.'='.$value->REFERENCED_TABLE_NAME.'.'.$value->REFERENCED_COLUMN_NAME.' '; |
|
| 37 | + } |
|
| 38 | + } else { |
|
| 39 | + $output = false; |
|
| 40 | + } |
|
| 41 | 41 | return $output; |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | public function whereClause($data = null, $condition = null, $con = null) |
| 45 | 45 | { |
| 46 | - $joinClause = self::joinClause(); |
|
| 46 | + $joinClause = self::joinClause(); |
|
| 47 | 47 | $connection = self::checkConnection($con); |
| 48 | 48 | $tableName = self::getTableName($connection); |
| 49 | 49 | $columnName = self::whereAndClause($tableName, $data, $condition); |
| 50 | 50 | |
| 51 | - $query = 'SELECT * FROM '.$tableName; |
|
| 51 | + $query = 'SELECT * FROM '.$tableName; |
|
| 52 | 52 | |
| 53 | - if (! $joinClause) { |
|
| 54 | - $query .= ' WHERE '.$columnName; |
|
| 55 | - } else { |
|
| 56 | - $query .= ($data === null) ? $joinClause : $joinClause .' AND '.$columnName; |
|
| 57 | - } |
|
| 58 | - return $query; |
|
| 53 | + if (! $joinClause) { |
|
| 54 | + $query .= ' WHERE '.$columnName; |
|
| 55 | + } else { |
|
| 56 | + $query .= ($data === null) ? $joinClause : $joinClause .' AND '.$columnName; |
|
| 57 | + } |
|
| 58 | + return $query; |
|
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | \ No newline at end of file |
@@ -28,10 +28,10 @@ |
||
| 28 | 28 | public function field($type, $fieldName, $length=NULL) |
| 29 | 29 | { |
| 30 | 30 | if($length === null){ |
| 31 | - $this->fieldDescription[] = $type ." ".$fieldName; |
|
| 31 | + $this->fieldDescription[] = $type ." ".$fieldName; |
|
| 32 | 32 | }else |
| 33 | 33 | { |
| 34 | - $this->fieldDescription[] = $type ." ".$fieldName." ".$length; |
|
| 34 | + $this->fieldDescription[] = $type ." ".$fieldName." ".$length; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | } |