Merge pull request #70 from 4CME/master

[UPD] - Mapped functions to public schema - FIX #68

Author: njbarrett

src/Eloquent/Builder.php

@@ -24,6 +24,6 @@ protected function getPostgisFields()
 
     protected function asWKT(GeometryInterface $geometry)
     {
-        return $this->getQuery()->raw(sprintf("ST_GeogFromText('%s')", $geometry->toWKT()));
+        return $this->getQuery()->raw(sprintf("public.ST_GeogFromText('%s')", $geometry->toWKT()));
     }
 }

src/Eloquent/PostgisTrait.php

@@ -26,10 +26,10 @@ protected function performInsert(EloquentBuilder $query, array $options = [])
         foreach ($this->attributes as $key => $value) {
             if ($value instanceof GeometryInterface && ! $value instanceof GeometryCollection) {
                 $this->geometries[$key] = $value; //Preserve the geometry objects prior to the insert
-                $this->attributes[$key] = $this->getConnection()->raw(sprintf("ST_GeogFromText('%s')", $value->toWKT()));
+                $this->attributes[$key] = $this->getConnection()->raw(sprintf("public.ST_GeogFromText('%s')", $value->toWKT()));
             }  else if ($value instanceof GeometryInterface && $value instanceof GeometryCollection) {
                 $this->geometries[$key] = $value; //Preserve the geometry objects prior to the insert
-                $this->attributes[$key] = $this->getConnection()->raw(sprintf("ST_GeomFromText('%s', 4326)", $value->toWKT()));
+                $this->attributes[$key] = $this->getConnection()->raw(sprintf("public.ST_GeomFromText('%s', 4326)", $value->toWKT()));
             }
         }
 

tests/Eloquent/BuilderTest.php

@@ -46,8 +46,8 @@ public function testUpdate()
     {
         $this->queryBuilder
           ->shouldReceive('raw')
-          ->with("ST_GeogFromText('POINT(2 1)')")
-          ->andReturn(new Expression("ST_GeogFromText('POINT(2 1)')"));
+          ->with("public.ST_GeogFromText('POINT(2 1)')")
+          ->andReturn(new Expression("public.ST_GeogFromText('POINT(2 1)')"));
 
         $this->queryBuilder
           ->shouldReceive('update')
@@ -66,8 +66,8 @@ public function testUpdateLinestring()
     {
         $this->queryBuilder
           ->shouldReceive('raw')
-          ->with("ST_GeogFromText('LINESTRING(0 0, 1 1, 2 2)')")
-          ->andReturn(new Expression("ST_GeogFromText('LINESTRING(0 0, 1 1, 2 2)')"));
+          ->with("public.ST_GeogFromText('LINESTRING(0 0, 1 1, 2 2)')")
+          ->andReturn(new Expression("public.ST_GeogFromText('LINESTRING(0 0, 1 1, 2 2)')"));
 
         $this->queryBuilder
           ->shouldReceive('update')

tests/Eloquent/PostgisTraitTest.php

@@ -34,7 +34,7 @@ public function testInsertPointHasCorrectSql()
         $this->model->point = new Point(1, 2);
         $this->model->save();
 
-        $this->assertContains("ST_GeogFromText('POINT(2 1)')", $this->queries[0]);
+        $this->assertContains("public.ST_GeogFromText('POINT(2 1)')", $this->queries[0]);
     }
 
     public function testUpdatePointHasCorrectSql()
@@ -43,7 +43,7 @@ public function testUpdatePointHasCorrectSql()
         $this->model->point = new Point(2, 4);
         $this->model->save();
 
-        $this->assertContains("ST_GeogFromText('POINT(4 2)')", $this->queries[0]);
+        $this->assertContains("public.ST_GeogFromText('POINT(4 2)')", $this->queries[0]);
     }
 }