changes to support geo

Author: sayadaazami

README.md

@@ -24,7 +24,7 @@ Use 3.* for Laravel 5.2.*
 
 Next add the DatabaseServiceProvider to your `config/app.php` file.
 
-    'Phaza\LaravelPostgis\DatabaseServiceProvider',
+    'Mammutgroup\LaravelPostgis\DatabaseServiceProvider',
 
 That's all.
 
@@ -52,7 +52,7 @@ Open the created migrations with your editor.
 
 ```PHP
 use Illuminate\Database\Migrations\Migration;
-use Phaza\LaravelPostgis\Schema\Blueprint;
+use Mammutgroup\LaravelPostgis\Schema\Blueprint;
 
 class CreateLocationsTable extends Migration {
 
@@ -111,8 +111,8 @@ what attributes/columns on your model are to be considered geometry objects.
 
 ```PHP
 use Illuminate\Database\Eloquent\Model;
-use Phaza\LaravelPostgis\Eloquent\PostgisTrait;
-use Phaza\LaravelPostgis\Geometries\Point;
+use Mammutgroup\LaravelPostgis\Eloquent\PostgisTrait;
+use Mammutgroup\LaravelPostgis\Geometries\Point;
 
 class Location extends Model
 {

src/Connectors/ConnectionFactory.php

@@ -1,7 +1,7 @@
-<?php namespace Phaza\LaravelPostgis\Connectors;
+<?php namespace Mammutgroup\LaravelPostgis\Connectors;
 
 use PDO;
-use Phaza\LaravelPostgis\PostgisConnection;
+use Mammutgroup\LaravelPostgis\PostgisConnection;
 
 class ConnectionFactory extends \Bosnadev\Database\Connectors\ConnectionFactory
 {
@@ -15,11 +15,7 @@ class ConnectionFactory extends \Bosnadev\Database\Connectors\ConnectionFactory
      */
     protected function createConnection($driver, $connection, $database, $prefix = '', array $config = [])
     {
-        if ($this->container->bound($key = "db.connection.{$driver}")) {
-            return $this->container->make($key, [$connection, $database, $prefix, $config]);
-        }
-
-        if ($driver === 'pgsql') {
+        if ($driver === 'mysql') {
             return new PostgisConnection($connection, $database, $prefix, $config);
         }
 

src/DatabaseServiceProvider.php

@@ -1,12 +1,12 @@
-<?php namespace Phaza\LaravelPostgis;
+<?php namespace Mammutgroup\LaravelPostgis;
 
 use Illuminate\Database\DatabaseManager;
-use Phaza\LaravelPostgis\Connectors\ConnectionFactory;
+use Mammutgroup\LaravelPostgis\Connectors\ConnectionFactory;
 use Bosnadev\Database\DatabaseServiceProvider as PostgresDatabaseServiceProvider;
 
 /**
  * Class DatabaseServiceProvider
- * @package Phaza\LaravelPostgis
+ * @package Mammutgroup\LaravelPostgis
  */
 class DatabaseServiceProvider extends PostgresDatabaseServiceProvider
 {

src/Eloquent/Builder.php

@@ -1,7 +1,7 @@
-<?php namespace Phaza\LaravelPostgis\Eloquent;
+<?php namespace Mammutgroup\LaravelPostgis\Eloquent;
 
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use Phaza\LaravelPostgis\Geometries\GeometryInterface;
+use Mammutgroup\LaravelPostgis\Geometries\GeometryInterface;
 
 class Builder extends EloquentBuilder
 {

src/Eloquent/PostgisTrait.php

@@ -1,10 +1,10 @@
-<?php namespace Phaza\LaravelPostgis\Eloquent;
+<?php namespace Mammutgroup\LaravelPostgis\Eloquent;
 
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Support\Arr;
-use Phaza\LaravelPostgis\Exceptions\PostgisFieldsNotDefinedException;
-use Phaza\LaravelPostgis\Geometries\Geometry;
-use Phaza\LaravelPostgis\Geometries\GeometryInterface;
+use Mammutgroup\LaravelPostgis\Exceptions\PostgisFieldsNotDefinedException;
+use Mammutgroup\LaravelPostgis\Geometries\Geometry;
+use Mammutgroup\LaravelPostgis\Geometries\GeometryInterface;
 
 trait PostgisTrait
 {
@@ -14,7 +14,7 @@ trait PostgisTrait
      * Create a new Eloquent query builder for the model.
      *
      * @param  \Illuminate\Database\Query\Builder $query
-     * @return \Phaza\LaravelPostgis\Eloquent\Builder
+     * @return \Mammutgroup\LaravelPostgis\Eloquent\Builder
      */
     public function newEloquentBuilder($query)
     {

src/Exceptions/PostgisFieldsNotDefinedException.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Exceptions;
+<?php namespace Mammutgroup\LaravelPostgis\Exceptions;
 
 use RuntimeException;
 

src/Exceptions/UnknownWKTTypeException.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Exceptions;
+<?php namespace Mammutgroup\LaravelPostgis\Exceptions;
 
 use RuntimeException;
 

src/Geometries/Factory.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Geometries;
+<?php namespace Mammutgroup\LaravelPostgis\Geometries;
 
 class Factory implements \GeoIO\Factory {
     public function createPoint( $dimension, array $coordinates, $srid = null )

src/Geometries/Geometry.php

@@ -1,7 +1,7 @@
-<?php namespace Phaza\LaravelPostgis\Geometries;
+<?php namespace Mammutgroup\LaravelPostgis\Geometries;
 
 use GeoIO\WKB\Parser\Parser;
-use Phaza\LaravelPostgis\Exceptions\UnknownWKTTypeException;
+use Mammutgroup\LaravelPostgis\Exceptions\UnknownWKTTypeException;
 
 abstract class Geometry implements GeometryInterface, \JsonSerializable
 {

src/Geometries/GeometryCollection.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Geometries;
+<?php namespace Mammutgroup\LaravelPostgis\Geometries;
 
 use Countable;
 use GeoJson\GeoJson;

src/Geometries/GeometryInterface.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Geometries;
+<?php namespace Mammutgroup\LaravelPostgis\Geometries;
 
 interface GeometryInterface
 {

src/Geometries/LineString.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Geometries;
+<?php namespace Mammutgroup\LaravelPostgis\Geometries;
 
 class LineString extends PointCollection implements GeometryInterface
 {

src/Geometries/MultiLineString.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Geometries;
+<?php namespace Mammutgroup\LaravelPostgis\Geometries;
 
 use Countable;
 use InvalidArgumentException;

src/Geometries/MultiPoint.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Geometries;
+<?php namespace Mammutgroup\LaravelPostgis\Geometries;
 
 class MultiPoint extends PointCollection implements GeometryInterface, \JsonSerializable
 {

src/Geometries/MultiPolygon.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Geometries;
+<?php namespace Mammutgroup\LaravelPostgis\Geometries;
 
 use Countable;
 use InvalidArgumentException;

src/Geometries/Point.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Geometries;
+<?php namespace Mammutgroup\LaravelPostgis\Geometries;
 
 use GeoJson\GeoJson;
 

src/Geometries/PointCollection.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Geometries;
+<?php namespace Mammutgroup\LaravelPostgis\Geometries;
 
 use ArrayAccess;
 use ArrayIterator;

src/Geometries/Polygon.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Geometries;
+<?php namespace Mammutgroup\LaravelPostgis\Geometries;
 
 use Countable;
 

src/PostgisConnection.php

@@ -1,6 +1,7 @@
-<?php namespace Phaza\LaravelPostgis;
+<?php namespace Mammutgroup\LaravelPostgis;
 
-class PostgisConnection extends \Bosnadev\Database\PostgresConnection
+
+class PostgisConnection extends \Bosnadev\Database\MysqlConnection
 {
     /**
      * Get the default schema grammar instance.
@@ -21,4 +22,9 @@ public function getSchemaBuilder()
 
         return new Schema\Builder($this);
     }
+
+    protected function getDefaultQueryGrammar()
+    {
+        return $this->withTablePrefix(new \Illuminate\Database\Query\Grammars\MySqlGrammar);
+    }
 }

src/Schema/Blueprint.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Schema;
+<?php namespace Mammutgroup\LaravelPostgis\Schema;
 
 class Blueprint extends \Bosnadev\Database\Schema\Blueprint
 {

src/Schema/Builder.php

@@ -1,4 +1,4 @@
-<?php namespace Phaza\LaravelPostgis\Schema;
+<?php namespace Mammutgroup\LaravelPostgis\Schema;
 
 use Closure;
 

src/Schema/Grammars/PostgisGrammar.php

@@ -1,148 +1,7 @@
-<?php namespace Phaza\LaravelPostgis\Schema\Grammars;
+<?php namespace Mammutgroup\LaravelPostgis\Schema\Grammars;
 
-use Illuminate\Support\Fluent;
-use Phaza\LaravelPostgis\Schema\Blueprint;
-use Bosnadev\Database\Schema\Grammars\PostgresGrammar;
+use Bosnadev\Database\Schema\Grammars\MysqlGrammar;
 
-class PostgisGrammar extends PostgresGrammar
+class PostgisGrammar extends MysqlGrammar
 {
-    /**
-     * Adds a statement to add a point geometry column
-     *
-     * @param \Illuminate\Support\Fluent $column
-     * @return string
-     */
-    public function typePoint(Fluent $column)
-    {
-        return 'GEOGRAPHY(POINT, 4326)';
-    }
-
-    /**
-     * Adds a statement to add a point geometry column
-     *
-     * @param \Illuminate\Support\Fluent $column
-     * @return string
-     */
-    public function typeMultipoint(Fluent $column)
-    {
-        return 'GEOGRAPHY(MULTIPOINT, 4326)';
-    }
-
-    /**
-     * Adds a statement to add a polygon geometry column
-     *
-     * @param \Illuminate\Support\Fluent $column
-     * @return string
-     */
-    public function typePolygon(Fluent $column)
-    {
-        return 'GEOGRAPHY(POLYGON, 4326)';
-    }
-
-    /**
-     * Adds a statement to add a multipolygon geometry column
-     *
-     * @param \Illuminate\Support\Fluent $column
-     * @return string
-     */
-    public function typeMultipolygon(Fluent $column)
-    {
-        return 'GEOGRAPHY(MULTIPOLYGON, 4326)';
-    }
-
-    /**
-     * Adds a statement to add a linestring geometry column
-     *
-     * @param \Illuminate\Support\Fluent $column
-     * @return string
-     */
-    public function typeLinestring(Fluent $column)
-    {
-        return 'GEOGRAPHY(LINESTRING, 4326)';
-    }
-
-    /**
-     * Adds a statement to add a multilinestring geometry column
-     *
-     * @param \Illuminate\Support\Fluent $column
-     * @return string
-     */
-    public function typeMultilinestring(Fluent $column)
-    {
-        return 'GEOGRAPHY(MULTILINESTRING, 4326)';
-    }
-
-    /**
-     * Adds a statement to add a linestring geometry column
-     *
-     * @param \Illuminate\Support\Fluent $column
-     * @return string
-     */
-    public function typeGeography(Fluent $column)
-    {
-        return 'GEOGRAPHY';
-    }
-
-    /**
-     * Adds a statement to add a geometrycollection geometry column
-     *
-     * @param Blueprint $blueprint
-     * @param Fluent $command
-     * @return string
-     */
-    public function compileGeometrycollection(Blueprint $blueprint, Fluent $command)
-    {
-        $command->type = 'GEOMETRYCOLLECTION';
-
-        return $this->compileGeometry($blueprint, $command);
-    }
-
-    /**
-     * Adds a statement to create the postgis extension
-     *
-     * @param Blueprint $blueprint
-     * @param Fluent $command
-     * @return string
-     */
-    public function compileEnablePostgis(Blueprint $blueprint, Fluent $command)
-    {
-        return 'CREATE EXTENSION postgis';
-    }
-
-    /**
-     * Adds a statement to drop the postgis extension
-     *
-     * @param Blueprint $blueprint
-     * @param Fluent $command
-     * @return string
-     */
-    public function compileDisablePostgis(Blueprint $blueprint, Fluent $command)
-    {
-        return 'DROP EXTENSION postgis';
-    }
-
-    /**
-     * Adds a statement to add a geometry column
-     *
-     * @param Blueprint $blueprint
-     * @param Fluent $command
-     * @return string
-     */
-    protected function compileGeometry(Blueprint $blueprint, Fluent $command)
-    {
-
-        $dimensions = $command->dimensions ?: 2;
-        $typmod = $command->typmod ? 'true' : 'false';
-        $srid = $command->srid ?: 4326;
-
-        return sprintf(
-            "SELECT AddGeometryColumn('%s', '%s', %d, '%s', %d, %s)",
-            $blueprint->getTable(),
-            $command->column,
-            $srid,
-            strtoupper($command->type),
-            $dimensions,
-            $typmod
-        );
-    }
 }

tests/Connectors/ConnectionFactoryTest.php

@@ -1,8 +1,8 @@
 <?php
 
 use Illuminate\Container\Container;
-use Phaza\LaravelPostgis\Connectors\ConnectionFactory;
-use Phaza\LaravelPostgis\PostgisConnection;
+use Mammutgroup\LaravelPostgis\Connectors\ConnectionFactory;
+use Mammutgroup\LaravelPostgis\PostgisConnection;
 use Stubs\PDOStub;
 
 class ConnectionFactoryBaseTest extends BaseTestCase

tests/Eloquent/BuilderTest.php

@@ -5,11 +5,11 @@
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Database\Query\Expression;
 use Mockery as m;
-use Phaza\LaravelPostgis\Eloquent\Builder;
-use Phaza\LaravelPostgis\Eloquent\PostgisTrait;
-use Phaza\LaravelPostgis\Geometries\LineString;
-use Phaza\LaravelPostgis\Geometries\Point;
-use Phaza\LaravelPostgis\Geometries\Polygon;
+use Mammutgroup\LaravelPostgis\Eloquent\Builder;
+use Mammutgroup\LaravelPostgis\Eloquent\PostgisTrait;
+use Mammutgroup\LaravelPostgis\Geometries\LineString;
+use Mammutgroup\LaravelPostgis\Geometries\Point;
+use Mammutgroup\LaravelPostgis\Geometries\Polygon;
 
 class BuilderTest extends BaseTestCase
 {