Merge pull request #10 from XCMer/master

incorporating changes from the master branch of base repo
XCMer · Nov 8, 2013 · acc50ea · acc50ea
2 parents 9b0a56f + 51dd5cf
commit acc50ea
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/src/Raahul/LarryFour/Command/GenerateFromDb.php b/src/Raahul/LarryFour/Command/GenerateFromDb.php
@@ -96,7 +96,7 @@ public function fire()
         foreach ($tables as $table)
         {
             if( DB::getDriverName() === 'mysql' ) {
-                $tablesData[ $table ] = DB::select("DESCRIBE $table");
+                $tablesData[ $table ] = DB::select("DESCRIBE `$table`");
             } else if( DB::getDriverName() === 'pgsql' ) {
                 // PostgreSQL port of MySQL DESCRIBE statement
                 $tablesData[ $table ] = DB::select(

diff --git a/src/Raahul/LarryFour/DbParser.php b/src/Raahul/LarryFour/DbParser.php
@@ -84,6 +84,7 @@ private function createTableMigration($tableName, $columns)
                 'type' => $type,
                 'parameters' => $this->getLaravelColumnParameters($column->parameters, $type),
                 'default' => is_null($column->defaultValue) ? '' : $column->defaultValue,
+                'unsigned' => $column->unsigned,
                 'nullable' => $column->null,
                 'primary' => ( $column->index == 'primary' ),
                 'unique' => ( $column->index == 'unique' ),
@@ -110,7 +111,7 @@ private function getLaravelColumnType($column)
         }
 
         // Special handling for tinyints with precision 1, that can be bools
-        if (($column->type == 'tinyint') && ($column->parameters == array(1)))
+        if (($column->type == 'tinyint'))
         {
             return 'boolean';
         }

diff --git a/src/Raahul/LarryFour/Parser.php b/src/Raahul/LarryFour/Parser.php
@@ -190,6 +190,12 @@ public function parseFieldDefinitionLine($line, $model, $type)
         // Parse the field definition
         $parsed = $this->fieldParser->parse(trim($line));
 
+        // Check for errors
+        if (!$parsed)
+        {
+            throw new ParseError("Could not parse field line. Check for errors like misplaced quotes.");
+        }
+
         // Check if the field is timestamps
         if ($parsed['type'] == 'timestamps')
         {

diff --git a/tests/ParseErrorsTest.php b/tests/ParseErrorsTest.php
@@ -107,6 +107,16 @@ public function testRelatedModelNotDefinedError()
     $this->assertErrorOutput($input, "Model definition for model \"Profile\" not found, but relation to it is defined in model \"User\"");
     }
 
+    public function testSegmentParsingError()
+    {
+        $input = <<<EOF
+User:
+    access enum "admin","jack","
+EOF;
+
+    $this->assertErrorOutput($input, "[Line 2] Could not parse field line. Check for errors like misplaced quotes.");
+    }
+
     private function assertErrorOutput($input, $expectedError)
     {
         try {