geekwright / XoopsCore

xoops_lib/Xmf/Database/Tables.php

Spacing +17 added lines, -17 removed lines

@@ -178,13 +178,13 @@ 
         $columnList = '';
         $firstComma = '';
         foreach ($columns as $col) {
-            $columnList .= $firstComma . $this->quoteIndexColumnName($col);
+            $columnList .= $firstComma.$this->quoteIndexColumnName($col);
             $firstComma = ', ';
         }
         if (isset($this->tables[$table])) {
             if (isset($this->tables[$table]['create']) && $this->tables[$table]['create']) {
                 $this->tables[$table]['keys'][$name]['columns'] = $columnList;
-                $this->tables[$table]['keys'][$name]['unique'] = (bool) $unique;
+                $this->tables[$table]['keys'][$name]['unique'] = (bool)$unique;
             } else {
                 $add = ($unique ? 'ADD UNIQUE INDEX' : 'ADD INDEX');
                 $this->queue[] = "ALTER TABLE `{$this->tables[$table]['name']}` {$add} `{$name}` ({$columnList})";
@@ -212,7 +212,7 @@ 
 
         $lengthPosition = strpos($column, '(');
         if ($lengthPosition) {
-            $length = ' ' . substr($column, $lengthPosition);
+            $length = ' '.substr($column, $lengthPosition);
             $column = substr($column, 0, $lengthPosition);
         }
         $quotedName = "`{$column}`{$length}";
@@ -350,7 +350,7 @@ 
 
                 return true;
             } else {
-                $this->queue[] = "ALTER TABLE `{$tableDef['name']}` " .
+                $this->queue[] = "ALTER TABLE `{$tableDef['name']}` ".
                     "CHANGE COLUMN `{$column}` `{$newName}` {$attributes} ";
                 // loop thru and find the column
                 foreach ($tableDef['columns'] as &$col) {
@@ -817,8 +817,8 @@ 
         $sql  = 'SELECT TABLE_NAME, ENGINE, CHARACTER_SET_NAME ';
         $sql .= ' FROM `INFORMATION_SCHEMA`.`TABLES` t, ';
         $sql .= ' `INFORMATION_SCHEMA`.`COLLATIONS` c ';
-        $sql .= ' WHERE t.TABLE_SCHEMA = \'' . $this->databaseName . '\' ';
-        $sql .= ' AND t.TABLE_NAME = \'' . $this->name($table) . '\' ';
+        $sql .= ' WHERE t.TABLE_SCHEMA = \''.$this->databaseName.'\' ';
+        $sql .= ' AND t.TABLE_NAME = \''.$this->name($table).'\' ';
         $sql .= ' AND t.TABLE_COLLATION  = c.COLLATION_NAME ';
 
         $result = $this->execSql($sql);
@@ -830,21 +830,21 @@ 
             return true;
         }
         $tableDef['name'] = $tableSchema['TABLE_NAME'];
-        $tableDef['options'] = 'ENGINE=' . $tableSchema['ENGINE'] . ' '
-            . 'DEFAULT CHARSET=' . $tableSchema['CHARACTER_SET_NAME'];
+        $tableDef['options'] = 'ENGINE='.$tableSchema['ENGINE'].' '
+            . 'DEFAULT CHARSET='.$tableSchema['CHARACTER_SET_NAME'];
 
         $sql  = 'SELECT * ';
         $sql .= ' FROM `INFORMATION_SCHEMA`.`COLUMNS` ';
-        $sql .= ' WHERE TABLE_SCHEMA = \'' . $this->databaseName . '\' ';
-        $sql .= ' AND TABLE_NAME = \'' . $this->name($table) . '\' ';
+        $sql .= ' WHERE TABLE_SCHEMA = \''.$this->databaseName.'\' ';
+        $sql .= ' AND TABLE_NAME = \''.$this->name($table).'\' ';
         $sql .= ' ORDER BY `ORDINAL_POSITION` ';
 
         $result = $this->execSql($sql);
 
         while ($column = $this->fetch($result)) {
-            $attributes = ' ' . $column['COLUMN_TYPE'] . ' '
+            $attributes = ' '.$column['COLUMN_TYPE'].' '
                 . (($column['IS_NULLABLE'] === 'NO') ? ' NOT NULL ' : '')
-                . (($column['COLUMN_DEFAULT'] === null) ? '' : " DEFAULT '" . $column['COLUMN_DEFAULT'] . "' ")
+                . (($column['COLUMN_DEFAULT'] === null) ? '' : " DEFAULT '".$column['COLUMN_DEFAULT']."' ")
                 . $column['EXTRA'];
 
             $columnDef = array(
@@ -858,8 +858,8 @@ 
         $sql  = 'SELECT `INDEX_NAME`, `SEQ_IN_INDEX`, `NON_UNIQUE`, ';
         $sql .= ' `COLUMN_NAME`, `SUB_PART` ';
         $sql .= ' FROM `INFORMATION_SCHEMA`.`STATISTICS` ';
-        $sql .= ' WHERE TABLE_SCHEMA = \'' . $this->databaseName . '\' ';
-        $sql .= ' AND TABLE_NAME = \'' . $this->name($table) . '\' ';
+        $sql .= ' WHERE TABLE_SCHEMA = \''.$this->databaseName.'\' ';
+        $sql .= ' AND TABLE_NAME = \''.$this->name($table).'\' ';
         $sql .= ' ORDER BY `INDEX_NAME`, `SEQ_IN_INDEX` ';
 
         $result = $this->execSql($sql);
@@ -876,13 +876,13 @@ 
                 $lastKey = $key['INDEX_NAME'];
                 $keyCols = $key['COLUMN_NAME'];
                 if (!empty($key['SUB_PART'])) {
-                    $keyCols .= ' (' . $key['SUB_PART'] . ')';
+                    $keyCols .= ' ('.$key['SUB_PART'].')';
                 }
                 $keyUnique = !$key['NON_UNIQUE'];
             } else {
-                $keyCols .= ', ' . $key['COLUMN_NAME'];
+                $keyCols .= ', '.$key['COLUMN_NAME'];
                 if (!empty($key['SUB_PART'])) {
-                    $keyCols .= ' (' . $key['SUB_PART'] . ')';
+                    $keyCols .= ' ('.$key['SUB_PART'].')';
                 }
             }
         };