andela-iadeniyi / Potato-ORM

src/Database/DatabaseQuery.php

Doc Comments +12 added lines, -4 removed lines

@@ -83,6 +83,7 @@ 
     /**
      * getTableName()
      *
+     * @param string $connection
      * @return string
      */
     protected function getTableName($connection)
@@ -123,7 +124,7 @@ 
      * @param  $tablename
      * @param  $con
      *
-     * @return bool
+     * @return boolean|null
      */
     public function checkTableExist($table, $con=NULL)
     {
@@ -138,7 +139,7 @@ 
     /**
      * checkTableName Return the table name
      *
-     * @param  $tablename
+     * @param  string $tablename
      * @param  $con
      *
      * @return string
@@ -159,7 +160,7 @@ 
      * checkColumn Check if column exist in table
      *
      * @param  $tableName
-     * @param  $columnName
+     * @param  string $columnName
      * @param  $con
      *
      * @return string
@@ -268,6 +269,7 @@ 
     /**
      * selectAllQuery
      *
+     * @param string $tableName
      * @return string
      */
     public function selectAllQuery($tableName)
@@ -327,6 +329,9 @@ 
     /**
      * selectQuery
      *
+     * @param string $tableName
+     * @param string $fields
+     * @param string $connection
      * @return string
      */
     public static function selectQuery($tableName, $fields, $data, $condition, $connection)
@@ -360,6 +365,7 @@ 
     /**
      * insertQuery
      *
+     * @param string $tableName
      * @return string
      */
     public function insertQuery($tableName)
@@ -373,6 +379,7 @@ 
     /**
      * updateQuery
      *
+     * @param string $tableName
      * @return string
      */
     public function updateQuery($tableName, $id)
@@ -387,7 +394,8 @@ 
      * query($query, $dbCOnnection)
      * Raw sql query
      *
-     * @return object
+     * @param string $query
+     * @return GetData
      */
     public function query($query, $con = NULL)
     {

Spacing +18 added lines, -18 removed lines

@@ -125,11 +125,11 @@ 
      *
      * @return bool
      */
-    public function checkTableExist($table, $con=NULL)
+    public function checkTableExist($table, $con = NULL)
     {
         $connection = $this->checkConnection($con);
         $query = $connection->query("SELECT 1 FROM {$table} LIMIT 1");
-        if($query !== false)
+        if ($query !== false)
         {
             return true;
         }
@@ -143,12 +143,12 @@ 
      *
      * @return string
      */
-    protected static function checkTableName($tableName, $con=NULL)
+    protected static function checkTableName($tableName, $con = NULL)
     {
         $connection = self::checkConnection($con);
 
         $query = $connection->query("SELECT 1 FROM {$tableName} LIMIT 1");
-        if($query !== false)
+        if ($query !== false)
         {
             return $tableName;
         }
@@ -164,13 +164,13 @@ 
      *
      * @return string
      */
-    protected static function checkColumn($tableName, $columnName, $con=NULL)
+    protected static function checkColumn($tableName, $columnName, $con = NULL)
     {
         $connection = self::checkConnection($con);
 
             $result = $connection->prepare("SELECT {$columnName} FROM {$tableName}");
             $result->execute();
-            if (! $result->columnCount())
+            if ( ! $result->columnCount())
             {
                 throw new ColumnNotExistExeption();
             }
@@ -194,7 +194,7 @@ 
         {
             $counter++;
             $insertQuery .= self::sanitize($key);
-            if($arraySize > $counter)
+            if ($arraySize > $counter)
                 $insertQuery .= ", ";
         }
         return $insertQuery;
@@ -216,8 +216,8 @@ 
         foreach ($data as $key => $value)
         {
             $counter++;
-            $insertQuery .= "'".self::sanitize($value) ."'";
-            if($arraySize > $counter)
+            $insertQuery .= "'".self::sanitize($value)."'";
+            if ($arraySize > $counter)
                 $insertQuery .= ", ";
         }
         return $insertQuery;
@@ -240,7 +240,7 @@ 
         {
             $counter++;
             $columnName = self::checkColumn($tableName, self::sanitize($key));
-            $updateQuery .= $columnName ." = '".self::sanitize($value)."'";
+            $updateQuery .= $columnName." = '".self::sanitize($value)."'";
             if ($arraySize > $counter)
             {
                 $updateQuery .= ", ";
@@ -291,10 +291,10 @@ 
             {
                 $counter++;
                 $columnName = self::checkColumn($tableName, self::sanitize($key));
-                $where .= $tableName.'.'.$columnName ." = '".self::sanitize($value)."'";
+                $where .= $tableName.'.'.$columnName." = '".self::sanitize($value)."'";
                 if ($arraySize > $counter)
                 {
-                    $where .= " " . $condition . " ";
+                    $where .= " ".$condition." ";
                 }
             }
         } else {
@@ -310,14 +310,14 @@ 
         $counter = 0;
         $arraySize = count($data);
 
-        foreach ( $data as $key => $value )
+        foreach ($data as $key => $value)
         {
             $counter++;
             $columnName = self::checkColumn($tableName, self::sanitize($key));
-            $where .= $columnName ." LIKE '%".self::sanitize($value)."%'";
-            if ( $arraySize > $counter )
+            $where .= $columnName." LIKE '%".self::sanitize($value)."%'";
+            if ($arraySize > $counter)
             {
-                $where .= " " . $condition . " ";
+                $where .= " ".$condition." ";
             }
         }
 
@@ -337,7 +337,7 @@ 
         try
         {
             $arraySize = count($data);
-            if( $arraySize > 1 && $condition == NULL)
+            if ($arraySize > 1 && $condition == NULL)
             {
                 $query = "Please Supply the condition";
             }
@@ -348,7 +348,7 @@ 
                 } elseif ($condition === 'LIKE') {
                     $columnName = self::whereLikeClause($tableName, $data, $condition);
                 } 
-                $query =  "SELECT $fields FROM $tableName WHERE $columnName";
+                $query = "SELECT $fields FROM $tableName WHERE $columnName";
             }
         } catch (PDOException $e) {
             $query = $e->getMessage();

src/Helper/Relationships.php

Spacing +5 added lines, -5 removed lines

@@ -23,16 +23,16 @@ 
         $output = "";
         $i = 0;
 
-        if (! isset($data[0]) || $data[1]->REFERENCED_TABLE_NAME !== null) {
-            foreach($data as $key => $value) {
+        if ( ! isset($data[0]) || $data[1]->REFERENCED_TABLE_NAME !== null) {
+            foreach ($data as $key => $value) {
                 if ( ! empty($value->REFERENCED_TABLE_NAME)) {
                     $output .= ' JOIN '.$value->REFERENCED_TABLE_NAME;
                 }
             }
-            foreach($data as $key => $value) {
+            foreach ($data as $key => $value) {
                 $i++;
                 $whereAnd = $i > 1 ? 'AND' : 'WHERE';
-                if ( empty($value->REFERENCED_TABLE_NAME)) {
+                if (empty($value->REFERENCED_TABLE_NAME)) {
                     $value->REFERENCED_TABLE_NAME = self::getTableName($connection);
                     $value->REFERENCED_COLUMN_NAME = $value->COLUMN_NAME;
                 }
@@ -58,7 +58,7 @@ 
         } else if ($joinClause == false && $data !== null) {
             $query .= ' WHERE '.$columnName;
         } else {
-            $query .= ($data === null) ? $joinClause : $joinClause .' AND '.$columnName;
+            $query .= ($data === null) ? $joinClause : $joinClause.' AND '.$columnName;
         }
         return $query;
     }