hfw / db

bin/helix.db.migrate.php

Spacing +5 added lines, -14 removed lines

@@ -28,7 +28,7 @@ 
 
     private Schema $schema;
 
-    public function __construct (array $argv, array $opt) {
+    public function __construct(array $argv, array $opt) {
         $this->argv = $argv;
         $opt['connection'] ??= 'default';
         $opt['config'] ??= 'db.config.php';
@@ -39,15 +39,15 @@ 
         $this->schema = $this->db->getSchema();
     }
 
-    private function _stderr (string $text): void {
+    private function _stderr(string $text): void {
         fputs(STDERR, "{$text}\n\n");
     }
 
-    private function _stdout (string $text): void {
+    private function _stdout(string $text): void {
         echo "{$text}\n\n";
     }
 
-    private function _usage_exit (): void {
+    private function _usage_exit(): void {
         $this->_stderr(<<< USAGE
         
         $ php {$this->argv[0]} [OPTIONS] ACTION
@@ -337,13 +337,4 @@ 
              */
             public function down (\$schema)
             {
-        {$down}
-            }
-
-        };
-
-        MIGRATION
-        );
-    }
-
-})->_exec();
+        {$down}
\ No newline at end of file

src/DB/Schema.php

Spacing +33 added lines, -33 removed lines

@@ -116,13 +116,13 @@ 
      */
     protected const PHP_TYPES = [
         'bool' => self::T_BOOL,
-        'boolean' => self::T_BOOL,  // gettype()
-        'double' => self::T_FLOAT,  // gettype()
+        'boolean' => self::T_BOOL, // gettype()
+        'double' => self::T_FLOAT, // gettype()
         'float' => self::T_FLOAT,
         'int' => self::T_INT,
-        'integer' => self::T_INT,   // gettype()
+        'integer' => self::T_INT, // gettype()
         'string' => self::T_STRING,
-        'String' => self::T_TEXT,   // @var String
+        'String' => self::T_TEXT, // @var String
         'STRING' => self::T_BLOB    // @var STRING
     ];
 
@@ -132,14 +132,14 @@ 
      */
     const PHP_TYPE_NAMES = [
         'bool' => 'T_BOOL',
-        'boolean' => 'T_BOOL',  // gettype()
-        'double' => 'T_BLOB',   // gettype()
+        'boolean' => 'T_BOOL', // gettype()
+        'double' => 'T_BLOB', // gettype()
         'float' => 'T_FLOAT',
         'int' => 'T_INT',
-        'integer' => 'T_INT',   // gettype()
+        'integer' => 'T_INT', // gettype()
         'string' => 'T_STRING',
-        'String' => 'T_TEXT',   // @var String
-        'STRING' => 'T_BLOB',   // @var STRING
+        'String' => 'T_TEXT', // @var String
+        'STRING' => 'T_BLOB', // @var STRING
     ];
 
     /**
@@ -149,7 +149,7 @@ 
         // bool
         'BOOLEAN' => 'bool',
         // int
-        'BIGINT' => 'int',  // mysql
+        'BIGINT' => 'int', // mysql
         'INTEGER' => 'int', // sqlite (must be this type to allow AUTOINCREMENT)
         // float
         'DOUBLE PRECISION' => 'float',
@@ -158,7 +158,7 @@ 
         // string <= 64k
         'TEXT' => 'String',
         // string > 64k
-        'BLOB' => 'STRING',     // sqlite
+        'BLOB' => 'STRING', // sqlite
         'LONGBLOB' => 'STRING', // mysql
     ];
 
@@ -220,7 +220,7 @@ 
     /**
      * @param DB $db
      */
-    public function __construct (DB $db) {
+    public function __construct(DB $db) {
         $this->db = $db;
         $this->colDefs ??= self::COLUMN_DEFINITIONS[$db->getDriver()];
     }
@@ -233,7 +233,7 @@ 
      * @param int $type
      * @return $this
      */
-    public function addColumn (string $table, string $column, int $type = self::T_STRING) {
+    public function addColumn(string $table, string $column, int $type = self::T_STRING) {
         $type = $this->colDefs[$type & self::T_MASK];
         $this->db->exec("ALTER TABLE {$table} ADD COLUMN {$column} {$type}");
         unset($this->tables[$table]);
@@ -259,7 +259,7 @@ 
      * @param array[] $constraints `[ <TABLE_CONST> => spec ]`
      * @return $this
      */
-    public function createTable (string $table, array $columns, array $constraints = []) {
+    public function createTable(string $table, array $columns, array $constraints = []) {
         $defs = $this->toColumnDefinitions($columns);
 
         /** @var string[] $pk */
@@ -295,7 +295,7 @@ 
      * @param string $column
      * @return $this
      */
-    public function dropColumn (string $table, string $column) {
+    public function dropColumn(string $table, string $column) {
         $this->db->exec("ALTER TABLE {$table} DROP COLUMN {$column}");
         unset($this->tables[$table]);
         return $this;
@@ -306,7 +306,7 @@ 
      *
      * @param string $table
      */
-    public function dropTable (string $table): void {
+    public function dropTable(string $table): void {
         $this->db->exec("DROP TABLE IF EXISTS {$table}");
         unset($this->tables[$table]);
     }
@@ -323,7 +323,7 @@ 
      * @param string $column
      * @return array[] Keyed by name.
      */
-    public function getColumnInfo (string $table): array {
+    public function getColumnInfo(string $table): array {
         if ($this->db->isSQLite()) {
             $info = $this->db->query("PRAGMA table_info({$table})")->fetchAll();
             return array_combine(array_column($info, 'name'), array_map(fn(array $each) => [
@@ -343,7 +343,7 @@ 
     /**
      * @return DB
      */
-    public function getDb () {
+    public function getDb() {
         return $this->db;
     }
 
@@ -351,7 +351,7 @@ 
      * @param string $name
      * @return null|Table
      */
-    public function getTable (string $name) {
+    public function getTable(string $name) {
         if (!isset($this->tables[$name])) {
             if ($this->db->isSQLite()) {
                 $info = $this->db->query("PRAGMA table_info({$name})")->fetchAll();
@@ -374,7 +374,7 @@ 
      * @param string $table
      * @return bool
      */
-    final public function offsetExists ($table): bool {
+    final public function offsetExists($table): bool {
         return (bool)$this->offsetGet($table);
     }
 
@@ -384,7 +384,7 @@ 
      * @param string $table
      * @return null|Table
      */
-    public function offsetGet ($table) {
+    public function offsetGet($table) {
         return $this->getTable($table);
     }
 
@@ -393,7 +393,7 @@ 
      * @param $value
      * @throws LogicException
      */
-    final public function offsetSet ($offset, $value) {
+    final public function offsetSet($offset, $value) {
         throw new LogicException('The schema cannot be altered this way.');
     }
 
@@ -401,7 +401,7 @@ 
      * @param $offset
      * @throws LogicException
      */
-    final public function offsetUnset ($offset) {
+    final public function offsetUnset($offset) {
         throw new LogicException('The schema cannot be altered this way.');
     }
 
@@ -413,7 +413,7 @@ 
      * @param string $newName
      * @return $this
      */
-    public function renameColumn (string $table, string $oldName, string $newName) {
+    public function renameColumn(string $table, string $oldName, string $newName) {
         $this->db->exec("ALTER TABLE {$table} RENAME COLUMN {$oldName} TO {$newName}");
         unset($this->tables[$table]);
         return $this;
@@ -426,7 +426,7 @@ 
      * @param string $newName
      * @return $this
      */
-    public function renameTable (string $oldName, string $newName) {
+    public function renameTable(string $oldName, string $newName) {
         $this->db->exec("ALTER TABLE {$oldName} RENAME TO {$newName}");
         unset($this->tables[$oldName]);
         return $this;
@@ -438,7 +438,7 @@ 
      * @param int[] $types
      * @return int[]
      */
-    protected function sortColumns (array $types): array {
+    protected function sortColumns(array $types): array {
         uksort($types, function(string $a, string $b) use ($types) {
             // descending index priority, increasing size, name
             return $types[$b] <=> $types[$a] ?: $a <=> $b;
@@ -450,7 +450,7 @@ 
      * @param int[] $columns `[ name => <I_CONST> | <T_CONST> ]`
      * @return string[]
      */
-    protected function toColumnDefinitions (array $columns): array {
+    protected function toColumnDefinitions(array $columns): array {
         assert(count($columns) > 0);
         $columns = $this->sortColumns($columns);
         $defs = [];
@@ -476,7 +476,7 @@ 
      * @param Column $foreign
      * @return string
      */
-    protected function toForeignKeyConstraint (string $table, string $local, int $type, Column $foreign): string {
+    protected function toForeignKeyConstraint(string $table, string $local, int $type, Column $foreign): string {
         return sprintf(
             'CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s) ON UPDATE CASCADE ON DELETE %s',
             $this->toForeignKeyConstraint_name($table, $local),
@@ -494,7 +494,7 @@ 
      * @param string $column
      * @return string
      */
-    protected function toForeignKeyConstraint_name (string $table, string $column): string {
+    protected function toForeignKeyConstraint_name(string $table, string $column): string {
         return 'FK_' . $table . '__' . $column;
     }
 
@@ -503,7 +503,7 @@ 
      * @param string[] $columns
      * @return string
      */
-    protected function toPrimaryKeyConstraint (string $table, array $columns): string {
+    protected function toPrimaryKeyConstraint(string $table, array $columns): string {
         return sprintf(
             'CONSTRAINT %s PRIMARY KEY (%s)',
             $this->toPrimaryKeyConstraint_name($table, $columns),
@@ -518,7 +518,7 @@ 
      * @param string[] $columns
      * @return string
      */
-    protected function toPrimaryKeyConstraint_name (string $table, array $columns): string {
+    protected function toPrimaryKeyConstraint_name(string $table, array $columns): string {
         sort($columns, SORT_STRING);
         return 'PK_' . $table . '__' . implode('__', $columns);
     }
@@ -528,7 +528,7 @@ 
      * @param string[] $columns
      * @return string
      */
-    protected function toUniqueKeyConstraint (string $table, array $columns): string {
+    protected function toUniqueKeyConstraint(string $table, array $columns): string {
         return sprintf(
             'CONSTRAINT %s UNIQUE (%s)',
             $this->toUniqueKeyConstraint_name($table, $columns),
@@ -543,7 +543,7 @@ 
      * @param string[] $columns
      * @return string
      */
-    protected function toUniqueKeyConstraint_name (string $table, array $columns): string {
+    protected function toUniqueKeyConstraint_name(string $table, array $columns): string {
         sort($columns, SORT_STRING);
         return 'UQ_' . $table . '__' . implode('__', $columns);
     }

Braces +1 added lines, -2 removed lines

@@ -356,8 +356,7 @@
             if ($this->db->isSQLite()) {
                 $info = $this->db->query("PRAGMA table_info({$name})")->fetchAll();
                 $cols = array_column($info, 'name');
-            }
-            else {
+            } else {
                 $cols = $this->db->query("SELECT column_name FROM information_schema.tables WHERE table_name = \"{$name}\"")->fetchAll(DB::FETCH_COLUMN);
             }
             if (!$cols) {