Merge pull request #97 from grimzy/master

Use the schema defined in the Laravel configuration

Author: njbarrett

config/postgis.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+
+  'schema' => 'public'  // Schema for the Postgis extension
+
+];

src/DatabaseServiceProvider.php

@@ -10,6 +10,13 @@
  */
 class DatabaseServiceProvider extends PostgresDatabaseServiceProvider
 {
+    public function boot() {
+      // Load the config
+      $config_path = __DIR__ . '/../config/postgis.php';
+      $this->publishes([$config_path => config_path('postgis.php')], 'postgis');
+      $this->mergeConfigFrom($config_path, 'postgis');
+    }
+
     /**
      * Register the service provider.
      *

src/Eloquent/Builder.php

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

src/Eloquent/PostgisTrait.php

@@ -33,15 +33,24 @@ protected function performInsert(EloquentBuilder $query, array $options = [])
                     $attrs = $this->getPostgisType($key);
                     switch (strtoupper($attrs['geomtype'])) {
                         case 'GEOMETRY':
-                            $this->attributes[$key] = $this->getConnection()->raw(sprintf("public.ST_GeomFromText('%s', '%d')", $value->toWKT(), $attrs['srid']));
+                            $this->attributes[$key] = $this->getConnection()->raw(
+                              sprintf("%s.ST_GeomFromText('%s', '%d')",
+                                config('postgis.schema'), $value->toWKT(), $attrs['srid'])
+                            );
                             break;
                         case 'GEOGRAPHY':
                         default:
-                            $this->attributes[$key] = $this->getConnection()->raw(sprintf("public.ST_GeogFromText('%s')", $value->toWKT()));
+                            $this->attributes[$key] = $this->getConnection()->raw(
+                              sprintf("%s.ST_GeogFromText('%s')",
+                                config('postgis.schema'), $value->toWKT())
+                            );
                             break;
                     }
                 } else {
-                    $this->attributes[$key] = $this->getConnection()->raw(sprintf("public.ST_GeomFromText('%s', 4326)", $value->toWKT()));
+                    $this->attributes[$key] = $this->getConnection()->raw(
+                      sprintf("%s.ST_GeomFromText('%s', 4326)",
+                        config('postgis.schema'), $value->toWKT())
+                    );
                 }
             }
         }