nchizhov / inok-dbf2mysql

src/convert.php

Spacing +6 added lines, -8 removed lines

@@ -135,7 +135,7 @@ 
       PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC
     ];
     try {
-      $this->db = new PDO("mysql:host=".$this->config["db_host"].";port=".$this->config["db_port"].";dbname=" . $this->config["db_name"],
+      $this->db = new PDO("mysql:host=".$this->config["db_host"].";port=".$this->config["db_port"].";dbname=".$this->config["db_name"],
                            $this->config["db_username"], $this->config["db_password"], $db_options);
     }
     catch (PDOException $e) {
@@ -242,7 +242,7 @@ 
     $this->column_fixes = [];
     $sql_keys = [];
     $sql_values = [];
-    foreach($this->dbfColumns as $column) {
+    foreach ($this->dbfColumns as $column) {
       $sql_keys[] = "`".$column["name"]."`";
       $sql_values[] = ":".$column["name"];
       if (in_array($column["type"], ["F", "N", "I", "Y", "0"])) {
@@ -314,7 +314,7 @@ 
     $this->writeLog("\nCalculate column types for table <yellow>".$this->dbfHeaders["table"]."<default>");
     $lines = [];
     foreach ($this->dbfColumns as $column) {
-      if (in_array($column["type"], ["F", "N",  "I", "Y", "0"])) {
+      if (in_array($column["type"], ["F", "N", "I", "Y", "0"])) {
         $result = $this->column_fixes[$column["name"]];
         $unsigned = !($result["min"] < 0);
         if ($unsigned) {
@@ -374,7 +374,7 @@ 
                         "table" => $this->dbfHeaders["table"],
                         "column" => $this->config["key_field"]]);
       if ($result->rowCount()) {
-        $this->db->exec("ALTER TABLE `" . $this->dbfHeaders["table"] . "` ADD INDEX(`" . $this->config["key_field"] . "`)");
+        $this->db->exec("ALTER TABLE `".$this->dbfHeaders["table"]."` ADD INDEX(`".$this->config["key_field"]."`)");
       }
     }
   }
@@ -384,13 +384,11 @@ 
     if ($this->percent <> !$percent) {
       $this->percent = $percent;
       $part1 = (($percent < 25) ?
-          $this->colors["white"].str_repeat("H", $percent).$this->colors["default"].$this->colors["red"].str_repeat(".", 25 - $percent) :
-          $this->colors["white"].str_repeat("H", 25)).$this->colors["default"];
+          $this->colors["white"].str_repeat("H", $percent).$this->colors["default"].$this->colors["red"].str_repeat(".", 25 - $percent) : $this->colors["white"].str_repeat("H", 25)).$this->colors["default"];
       if ($percent > 25) {
         $percent = $percent - 25;
         $part2 = (($percent < 50) ?
-            $this->colors["white"].str_repeat("H", $percent).$this->colors["default"].$this->colors["red"].str_repeat(".", 25 - $percent) :
-            $this->colors["white"].str_repeat("H", 25)).$this->colors["default"];
+            $this->colors["white"].str_repeat("H", $percent).$this->colors["default"].$this->colors["red"].str_repeat(".", 25 - $percent) : $this->colors["white"].str_repeat("H", 25)).$this->colors["default"];
       } else {
         $part2 = $this->colors["red"].str_repeat(".", 25).$this->colors["default"];
       }

Braces +8 added lines, -16 removed lines

@@ -107,8 +107,7 @@ 
     if (!is_null($this->config["dbf_list"])) {
       if (is_array($this->config["dbf_list"])) {
         $this->config["dbf_list"] = array_map("strtolower", $this->config["dbf_list"]);
-      }
-      else {
+      } else {
         $this->writeLog("<red>Error in config:<default> dbf list should be array or null");
         exit;
       }
@@ -137,8 +136,7 @@ 
     try {
       $this->db = new PDO("mysql:host=".$this->config["db_host"].";port=".$this->config["db_port"].";dbname=" . $this->config["db_name"],
                            $this->config["db_username"], $this->config["db_password"], $db_options);
-    }
-    catch (PDOException $e) {
+    } catch (PDOException $e) {
       $this->writeLog("<red>Error in MySQL connection:<default> ".$e->getMessage());
       exit;
     }
@@ -188,8 +186,7 @@ 
         case "0":
           if ($column["decimal"]) {
             $line[] = $name." decimal(".($column["length"] + $column["decimal"]).", ".$column["decimal"].") NULL DEFAULT 0";
-          }
-          else {
+          } else {
             $line[] = $name." bigint(".$column["length"].") NULL DEFAULT 0";
           }
           break;
@@ -225,8 +222,7 @@ 
                                  COMMENT='Converted DBF file: ".$this->dbfHeaders["table"].".dbf'");
       if ($result !== false) {
         $this->writeLog("Table <yellow>".$this->dbfHeaders["table"]."<default> successfully created");
-      }
-      else {
+      } else {
         $this->writeLog("<red>Error in MySQL:<default> ".print_r($this->db->errorInfo(), true));
       }
     }
@@ -264,13 +260,11 @@ 
       $deleted = false;
       if ($this->config["deleted_records"]) {
         $result->execute($record);
-      }
-      else {
+      } else {
         if (!$record["deleted"]) {
           unset($record["deleted"]);
           $result->execute($record);
-        }
-        else {
+        } else {
           $deleted = true;
         }
       }
@@ -330,8 +324,7 @@ 
               $type = "tinyint";
             }
           }
-        }
-        else {
+        } else {
           if (!$column["decimal"]) {
             $type = "bigint";
             if ($result["min"] >= -128 && $result["max"] <= 127) {
@@ -348,8 +341,7 @@ 
         if ($column["decimal"] && $unsigned) {
           $lines[] = "CHANGE `".$column["name"]."` `".$column["name"]."` decimal(".($column["length"] + $column["decimal"]).", ".$column["decimal"].") UNSIGNED  
                       NULL DEFAULT '0'";
-        }
-        else {
+        } else {
           $lines[] = "CHANGE `".$column["name"]."` `".$column["name"]."` ".$type."(".$column["length"].")".($unsigned ? " UNSIGNED" : "")." 
                       NULL DEFAULT '0'";
         }