Merge pull request #30 from Stanislas-Poisson/develop

#28 - Corse cities not set
Stanislas-Poisson · Jul 5, 2018 · ae489b2 · ae489b2
2 parents ca9c8d5 + f002ea4
commit ae489b2
Show file tree

Hide file tree

Showing 6 changed files with 35,425 additions and 35,057 deletions.
diff --git a/Exports/csv/cities.csv b/Exports/csv/cities.csv
diff --git a/Exports/json/cities.json b/Exports/json/cities.json
diff --git a/Exports/sql/cities.sql b/Exports/sql/cities.sql
diff --git a/Exports/sql/departments.sql b/Exports/sql/departments.sql
@@ -1,6 +1,6 @@
--- MySQL dump 10.13  Distrib 5.7.22, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.20, for Linux (x86_64)
 --
--- Host: localhost    Database: frenchzipcode
+-- Host: 127.0.0.1    Database: frenchzipcode
 -- ------------------------------------------------------
 -- Server version	5.7.22
 
@@ -54,4 +54,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2018-06-18 21:03:14
+-- Dump completed on 2018-07-05 13:51:23
diff --git a/Exports/sql/regions.sql b/Exports/sql/regions.sql
@@ -1,6 +1,6 @@
--- MySQL dump 10.13  Distrib 5.7.22, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.20, for Linux (x86_64)
 --
--- Host: localhost    Database: frenchzipcode
+-- Host: 127.0.0.1    Database: frenchzipcode
 -- ------------------------------------------------------
 -- Server version	5.7.22
 
@@ -51,4 +51,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2018-06-18 21:03:13
+-- Dump completed on 2018-07-05 13:51:23
diff --git a/app/Console/Commands/Builder.php b/app/Console/Commands/Builder.php
@@ -35,7 +35,7 @@ class Builder extends Command
     protected $patterns = [
         'regions'     => '/([\d]{2})(?:\t[\d\w]+){2}(?:.*)\t(.*)/',
         'departments' => '/([\d]{2})\t([\d\w]{2,3})(?:\t[\d\w]+){2}(?:.*)\t(.*)/',
-        'cities'      => '/(?:\t|[\d]+\t){1,3}([\d]{2,3})\t([\d]{2,3})(?:.*)/',
+        'cities'      => '/(?:\t|[\d]+\t){1,3}([\d\w]{2,3})\t([\d]{2,3})(?:.*)/',
     ];
 
     /**