recognize UNSIGNED, and add a Table constant for the PDO driver

atlasphp · Jun 30, 2018 · 60060ca · 60060ca
1 parent b4d6dc1
commit 60060ca
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,12 @@
 <phpunit bootstrap="phpunit.php">
     <testsuites>
-        <testsuite>
+        <testsuite name="atlas/cli">
             <directory>tests/</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
 </phpunit>
diff --git a/resources/templates/TypeTable.tpl b/resources/templates/TypeTable.tpl
@@ -17,6 +17,8 @@ use Atlas\Table\Table;
  */
 class {TYPE}Table extends Table
 {
+    const DRIVER = {DRIVER};
+
     const NAME = {NAME};
 
     const COLUMNS = {COLUMNS};

diff --git a/src/Skeleton.php b/src/Skeleton.php
@@ -187,14 +187,24 @@ protected function getVars(string $type, string $table, array $columns, $sequenc
             $info .= "        '{$col['name']}' => " . var_export($col, true) . ',' . PHP_EOL;
 
 
-            $props .= " * @property mixed \${$col['name']} {$col['type']}";
+            $coltype = $col['type'];
+            $unsigned = '';
+            if (substr(strtoupper($coltype), -9) == ' UNSIGNED') {
+                $unsigned = substr($coltype, -9);
+                $coltype = substr($coltype, 0, -9);
+            }
+
+            $props .= " * @property mixed \${$col['name']} {$coltype}";
             if ($col['size'] !== null) {
                 $props .= "({$col['size']}";
                 if ($col['scale'] !== null) {
                     $props .= ",{$col['scale']}";
                 }
                 $props .= ')';
             }
+
+            $props .= $unsigned;
+
             if ($col['notnull'] === true) {
                 $props .= ' NOT NULL';
             }
@@ -231,9 +241,12 @@ protected function getVars(string $type, string $table, array $columns, $sequenc
         $fields = $props;
         $this->setRelatedFields($type, $fields);
 
+        $driver = $this->connection->getDriverName();
+
         return [
             '{NAMESPACE}' => $this->namespace,
             '{TYPE}' => $type,
+            '{DRIVER}' => "'{$driver}'",
             '{NAME}' => "'{$table}'",
             '{COLUMN_NAMES}' => $cols,
             '{COLUMN_DEFAULTS}' => $default,