Skip to content

Commit 920c897

Browse files
MatanYadaevMatanYadaev
authored
Postgres support (#109)
* wip * wip * fix postgres ci * fixes * backward compatibility * fixes * fixes * fixes * fixes * fixes * fix ci * fix ci * fixes * fix ci * fix coverage * fixes * reduce ci jobs * fix mariadb * fix postgres * fix ci * fix ci * fix ci * fix ci * fix ci * fix ci * ci test * ci test * fix tests * fix tests * fixes * fixes * fixes * ci test * ci test * ci test * ci test * ci test * ci test * ci test * ci test * ci test * ci test * ci test * ci test * ci test
1 parent eac8c07 commit 920c897

40 files changed

+362
-141
lines changed

‎.github/workflows/pest-coverage.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Tests coverage
22

3-
on: [ push, pull_request ]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
48

59
jobs:
610
test:

‎.github/workflows/pest.yml

+16-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Tests
22

3-
on: [ push, pull_request ]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
48

59
jobs:
610
test:
@@ -13,8 +17,8 @@ jobs:
1317
matrix:
1418
php: [ 8.3, 8.2, 8.1 ]
1519
laravel: [ 10.* ]
16-
db: [ 'mysql:8.0', 'mysql:5.7', 'mariadb:10.9' ]
17-
dependency-version: [ prefer-lowest, prefer-stable ]
20+
db: [ 'mysql:8.0', 'mysql:5.7', 'mariadb:10.11', 'postgis/postgis:16-3.4', 'postgis/postgis:15-3.4', 'postgis/postgis:14-3.4', 'postgis/postgis:13-3.4', 'postgis/postgis:12-3.4' ]
21+
dependency-version: [ prefer-stable, prefer-lowest ]
1822
include:
1923
- laravel: 10.*
2024
testbench: ^8.0
@@ -25,9 +29,14 @@ jobs:
2529
env:
2630
MYSQL_ALLOW_EMPTY_PASSWORD: yes
2731
MYSQL_DATABASE: laravel_eloquent_spatial_test
32+
POSTGRES_DB: laravel_eloquent_spatial_test
33+
POSTGRES_USER: root
34+
POSTGRES_HOST_AUTH_METHOD: trust
2835
ports:
29-
- 3306
30-
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
36+
- ${{ contains(matrix.db, 'postgis') && '5432' || '3306' }}
37+
options: >-
38+
${{ (contains(matrix.db, 'postgis') && '--health-cmd="pg_isready"') || '--health-cmd="mysqladmin ping"' }}
39+
--health-interval=10s --health-timeout=5s --health-retries=3
3140
3241
steps:
3342
- name: Checkout code
@@ -46,5 +55,6 @@ jobs:
4655
4756
- name: Execute tests
4857
env:
49-
DB_PORT: ${{ job.services.db.ports['3306'] }}
58+
DB_PORT: ${{ job.services.db.ports[contains(matrix.db, 'postgis') && '5432' || '3306'] }}
59+
DB_CONNECTION: ${{ contains(matrix.db, 'postgis') && 'pgsql' || 'mysql' }}
5060
run: vendor/bin/pest

‎.github/workflows/php-cs-fixer.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Lint
22

3-
on: [ push, pull_request ]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
48

59
jobs:
610
php-cs-fixer:

‎.github/workflows/phpstan.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Static code analysis
22

3-
on: [ push, pull_request ]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
48

59
jobs:
610
phpstan:

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.idea
22
.php-cs-fixer.cache
3+
.phpunit.cache
34
.phpunit.result.cache
45
build
56
composer.lock

‎.run/Test.run.xml ‎.run/Test - MySQL 8.0.run.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Test" type="PestRunConfigurationType">
2+
<configuration default="false" name="Test - MySQL 8.0" type="PestRunConfigurationType">
3+
<CommandLine>
4+
<envs>
5+
<env name="DB_PORT" value="3307" />
6+
</envs>
7+
</CommandLine>
38
<option name="pestRunnerSettings">
49
<PestRunner method="" scope="ConfigurationFile" />
510
</option>

‎.run/Test - Postgres.run.xml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Test - Postgres" type="PestRunConfigurationType">
3+
<CommandLine>
4+
<envs>
5+
<env name="DB_CONNECTION" value="pgsql" />
6+
<env name="DB_PORT" value="5433" />
7+
</envs>
8+
</CommandLine>
9+
<option name="pestRunnerSettings">
10+
<PestRunner method="" scope="ConfigurationFile" />
11+
</option>
12+
<option name="runnerSettings">
13+
<PhpTestRunnerSettings method="" scope="ConfigurationFile" />
14+
</option>
15+
<method v="2" />
16+
</configuration>
17+
</component>

‎README.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88

99
**This Laravel package allows you to easily work with spatial data types and functions.**
1010

11-
This package supports MySQL v8, MySQL v5.7, and MariaDB v10.
11+
Supported databases:
12+
- MySQL 5.7/8
13+
- MariaDB 10
14+
- Postgres 12/13/14/15/16 with PostGIS 3.4
1215

1316
## Getting Started
1417

@@ -177,8 +180,8 @@ echo $londonEyePoint->getName(); // Point
177180

178181
Here are some useful commands for development:
179182

180-
* Run tests: `composer pest`
181-
* Run tests with coverage: `composer pest-coverage`
183+
* Run tests: `composer pest:mysql` or `composer pest:postgres`
184+
* Run tests with coverage: `composer pest-coverage:mysql`
182185
* Perform type checking: `composer phpstan`
183186
* Format your code: `composer php-cs-fixer`
184187

‎composer.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@
3838
"scripts": {
3939
"php-cs-fixer": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --allow-risky=yes",
4040
"phpstan": "./vendor/bin/phpstan analyse --memory-limit=2G",
41-
"pest": "./vendor/bin/pest",
42-
"pest-coverage": "XDEBUG_MODE=coverage ./vendor/bin/pest --coverage --min=100"
41+
"pest:mysql": "DB_PORT=3307 ./vendor/bin/pest",
42+
"pest:postgres": "DB_CONNECTION=pgsql DB_PORT=5433 ./vendor/bin/pest",
43+
"pest-coverage:mysql": "XDEBUG_MODE=coverage DB_PORT=3307 ./vendor/bin/pest --coverage --min=100"
4344
},
4445
"config": {
4546
"sort-packages": true,

‎docker-compose.yaml

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.8'
22

33
services:
4-
db:
4+
mysql:
55
container_name: mysql-laravel-eloquent-spatial
66
image: mysql:8.0
77
environment:
@@ -10,8 +10,21 @@ services:
1010
volumes:
1111
- mysql_data:/var/lib/mysql
1212
ports:
13-
- 3306:3306
13+
- 3307:3306
14+
restart: unless-stopped
15+
postgres:
16+
container_name: postgres-laravel-eloquent-spatial
17+
image: postgis/postgis:16-2
18+
environment:
19+
POSTGRES_DB: laravel_eloquent_spatial_test
20+
POSTGRES_USER: root
21+
POSTGRES_HOST_AUTH_METHOD: trust
22+
volumes:
23+
- postgres_data:/var/lib/postgresql/data
24+
ports:
25+
- 5433:5432
1426
restart: unless-stopped
1527

1628
volumes:
1729
mysql_data:
30+
postgres_data:

‎phpstan.neon

+11
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ parameters:
66
- tests
77
excludePaths:
88
- src/Factory.php
9+
ignoreErrors:
10+
-
11+
message: '#Call to an undefined method Illuminate\\Database\\Schema\\ColumnDefinition\:\:(isGeometry|projection)\(\)#'
12+
path: tests/database/migrations/*.php
13+
-
14+
message: '#Undefined variable: \$this#'
15+
path: tests/Expectations.php
16+
-
17+
message: '#Call to an undefined method Pest\\Expectation\<.+\>\:\:toBe(InstanceOf)?On(Postgres|Mysql)\(\)#'
18+
path: tests/*.php
19+
920
level: max
1021
checkMissingIterableValueType: true
1122
checkGenericClassInNonGenericObjectType: false

‎src/AxisOrder.php

+17-17
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,40 @@
88
use Illuminate\Database\MySqlConnection;
99
use PDO;
1010

11+
/** @codeCoverageIgnore */
1112
class AxisOrder
1213
{
13-
public function __construct()
14+
public static function supported(ConnectionInterface $connection): bool
1415
{
15-
}
16-
17-
public function supported(ConnectionInterface $connection): bool
18-
{
19-
/** @var MySqlConnection $connection */
20-
if ($this->isMariaDb($connection)) {
21-
// @codeCoverageIgnoreStart
16+
if (self::isMariaDb($connection)) {
2217
return false;
23-
// @codeCoverageIgnoreEnd
2418
}
2519

26-
if ($this->isMySql57($connection)) {
27-
// @codeCoverageIgnoreStart
28-
return false;
29-
// @codeCoverageIgnoreEnd
20+
if (self::isMySql8OrAbove($connection)) {
21+
return true;
3022
}
3123

32-
return true;
24+
return false;
3325
}
3426

35-
private function isMariaDb(MySqlConnection $connection): bool
27+
private static function isMariaDb(ConnectionInterface $connection): bool
3628
{
29+
if (! ($connection instanceof MySqlConnection)) {
30+
return false;
31+
}
32+
3733
return $connection->isMaria();
3834
}
3935

40-
private function isMySql57(MySqlConnection $connection): bool
36+
private static function isMySql8OrAbove(ConnectionInterface $connection): bool
4137
{
38+
if (! ($connection instanceof MySqlConnection)) {
39+
return false;
40+
}
41+
4242
/** @var string $version */
4343
$version = $connection->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION);
4444

45-
return version_compare($version, '5.8.0', '<');
45+
return version_compare($version, '8.0.0', '>=');
4646
}
4747
}

‎src/Doctrine/GeographyType.php

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace MatanYadaev\EloquentSpatial\Doctrine;
6+
7+
use Doctrine\DBAL\Platforms\AbstractPlatform;
8+
use Doctrine\DBAL\Types\Type;
9+
10+
/** @codeCoverageIgnore */
11+
class GeographyType extends Type
12+
{
13+
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
14+
{
15+
return 'geography';
16+
}
17+
18+
public function getName(): string
19+
{
20+
return 'geography';
21+
}
22+
}

‎src/Doctrine/GeometryCollectionType.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
use Doctrine\DBAL\Platforms\AbstractPlatform;
88
use Doctrine\DBAL\Types\Type;
99

10+
/** @codeCoverageIgnore */
1011
class GeometryCollectionType extends Type
1112
{
1213
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
1314
{
14-
// @codeCoverageIgnoreStart
1515
return 'geometrycollection';
16-
// @codeCoverageIgnoreEnd
1716
}
1817

1918
public function getName(): string

‎src/Doctrine/GeometryType.php

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace MatanYadaev\EloquentSpatial\Doctrine;
6+
7+
use Doctrine\DBAL\Platforms\AbstractPlatform;
8+
use Doctrine\DBAL\Types\Type;
9+
10+
/** @codeCoverageIgnore */
11+
class GeometryType extends Type
12+
{
13+
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
14+
{
15+
return 'geometry';
16+
}
17+
18+
public function getName(): string
19+
{
20+
return 'geometry';
21+
}
22+
}

‎src/Doctrine/LineStringType.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
use Doctrine\DBAL\Platforms\AbstractPlatform;
88
use Doctrine\DBAL\Types\Type;
99

10+
/** @codeCoverageIgnore */
1011
class LineStringType extends Type
1112
{
1213
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
1314
{
14-
// @codeCoverageIgnoreStart
1515
return 'linestring';
16-
// @codeCoverageIgnoreEnd
1716
}
1817

1918
public function getName(): string

‎src/Doctrine/MultiLineStringType.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
use Doctrine\DBAL\Platforms\AbstractPlatform;
88
use Doctrine\DBAL\Types\Type;
99

10+
/** @codeCoverageIgnore */
1011
class MultiLineStringType extends Type
1112
{
1213
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
1314
{
14-
// @codeCoverageIgnoreStart
1515
return 'multilinestring';
16-
// @codeCoverageIgnoreEnd
1716
}
1817

1918
public function getName(): string

‎src/Doctrine/MultiPointType.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
use Doctrine\DBAL\Platforms\AbstractPlatform;
88
use Doctrine\DBAL\Types\Type;
99

10+
/** @codeCoverageIgnore */
1011
class MultiPointType extends Type
1112
{
1213
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
1314
{
14-
// @codeCoverageIgnoreStart
1515
return 'multipoint';
16-
// @codeCoverageIgnoreEnd
1716
}
1817

1918
public function getName(): string

‎src/Doctrine/MultiPolygonType.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
use Doctrine\DBAL\Platforms\AbstractPlatform;
88
use Doctrine\DBAL\Types\Type;
99

10+
/** @codeCoverageIgnore */
1011
class MultiPolygonType extends Type
1112
{
1213
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
1314
{
14-
// @codeCoverageIgnoreStart
1515
return 'multipolygon';
16-
// @codeCoverageIgnoreEnd
1716
}
1817

1918
public function getName(): string

0 commit comments

Comments
 (0)