more code coverage fixes

Author: TheTechsTech

lib/ezSchema.php

@@ -107,50 +107,39 @@ public function __call($type, $args)
         $numberPattern = "/".\implode('|', $numberTypes)."/i";
         $dateTimePattern = "/".\implode('|', $dateTimeTypes)."/i";
         $objectPattern = "/".\implode('|', $objectTypes)."/i";
-		
-		$data = null;
-		if (\preg_match($stringPattern, $type)) {
+		      
+		$store = '';
+		$value = '';
+		$options = '';
+		$extra = '';
+        if (\preg_match($stringPattern, $type) 
+            || \preg_match($numberPattern, $type) 
+            || \preg_match($dateTimePattern, $type)
+        ) {
 			// check for string data type
+            // check for whole number data type
+			// check for date time data type
             $numberOrString = $args[0];
 			$store = \is_int($numberOrString) ? '('.$numberOrString.')' : '';
 			$store = empty($store) && !empty($numberOrString) ? ' '.$numberOrString : $store;
 			$value = !empty($args[1]) ? ' '.$args[1] : '';
 			$options = !empty($args[2]) ? ' '.$args[2] : '';
 			$extra = !empty($args[3]) ? ' '.$args[3] : '';
-			$data = $type.$store.$value.$options.$extra;
 		} elseif (\preg_match($numericPattern, $type)) {
 			// check for numeric data type
-			$size = '('.(!empty($args[0]) ? $args[0] : 10 ).',';
-			$size .= (!empty($args[1]) ? $args[1] : 2 ).')';
+			$store = '('.(!empty($args[0]) ? $args[0] : 10 ).',';
+			$store .= (!empty($args[1]) ? $args[1] : 2 ).')';
 			$value = !empty($args[2]) ? ' '.$args[2] : '';
 			$options = !empty($args[3]) ? $args[3] : '';
 			$extra = !empty($args[4]) ? ' '.$args[4] : '';
-			$data = $type.$size.$value.$options.$extra;
-		} elseif (\preg_match($numberPattern, $type)) {
-            // check for whole number data type
-            $numberOrString = $args[0];
-            $store = \is_int($numberOrString) ? '('.$numberOrString.')' : '';
-			$store = empty($store) && !empty($numberOrString) ? ' '.$numberOrString : $store;
-			$value = !empty($args[1]) ? ' '.$args[1] : '';
-			$options = !empty($args[2]) ? ' '.$args[2] : '';
-			$extra = !empty($args[3]) ? ' '.$args[3] : '';
-			$data = $type.$store.$value.$options.$extra;
-        } elseif (\preg_match($dateTimePattern, $type)) {
-			// check for date time data type
-            $numberOrString = $args[0];
-			$store = \is_int($numberOrString) ? '('.$numberOrString.')' : '';
-			$fraction = empty($store) && !empty($numberOrString) ? ' '.$numberOrString : $store;
-			$value = !empty($args[1]) ? ' '.$args[1] : '';
-			$options = !empty($args[2]) ? ' '.$args[2] : '';
-			$data = $type.$fraction.$value.$options;
         } elseif (\preg_match($objectPattern, $type)) {
 			// check for large object data type
-			$value = !empty($args[0]) ? ' '.$args[0] : ' ';
-			$data = $type.$value;
+			$store = !empty($args[0]) ? ' '.$args[0] : ' ';
         } else {
             throw new \Exception("$type does not exist");
         }
 
+		$data = $type.$store.$value.$options.$extra;
 		return $data;
     }
 

tests/ezSchemaTest.php

@@ -70,8 +70,10 @@ public function testColumn()
 
         $db = mysqlInstance([self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME]);
         $result = $db->create('profile',
-            column('id', INTR, 32, AUTO, PRIMARY),
-            column('name', CHAR, 32, notNULL)
+            column('id', INTR, 32, AUTO),
+            column('name', CHAR, 32, notNULL),
+            primary('id_pk', 'id'),
+            index('name_dx', 'name')
         );
 
         $this->assertEquals(0, $result);
@@ -102,6 +104,25 @@ public function test__call()
         $db->drop('profile');
     }
 
+    /**
+    * @covers ezsql\ezSchema::__call
+    */
+    public function test__call_Error()
+    {
+        if (!extension_loaded('mysqli')) {
+            $this->markTestSkipped(
+              'The MySQLi extension is not available.'
+            );
+        }
+
+        clearInstance();
+        $this->assertFalse(column('id', INTR, 32, AUTO, PRIMARY));
+        $db = mysqlInstance([self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME]);
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessageRegExp('/[does not exist]/');
+        $this->assertNull(column('id', 'DOS', 32));
+    }
+
     /**
     * @covers ezsql\ezSchema::vendor
     */
@@ -165,4 +186,12 @@ public function testVendor_Pdo()
         $pdo_mysql->connect();
         $this->assertEquals(MYSQLI, getVendor());
     }
+
+    /**
+    * @covers ezsql\ezSchema::__construct
+    */
+    public function test__construct()
+    {
+        $this->assertNotNull(new ezSchema('test'));
+    }
 }