diff --git a/app/Eloquent/Models/User.php b/app/Eloquent/Models/User.php
index eafa9aa..71ec3d8 100644
--- a/app/Eloquent/Models/User.php
+++ b/app/Eloquent/Models/User.php
@@ -75,9 +75,9 @@ class User extends Authenticatable
}
return $query
- ->where("first_name", "LIKE", "%{$text}%")
- ->orWhere("last_name", "LIKE", "%{$text}%")
- ->orWhere("email", "LIKE", "%{$text}%");
+ ->where("first_name", "ILIKE", $text)
+ ->orWhere("last_name", "ILIKE", $text)
+ ->orWhere("email", "ILIKE", $text);
}
public function saveAvatar(string $path): void
diff --git a/config/database.php b/config/database.php
index c3831fc..694a7fc 100644
--- a/config/database.php
+++ b/config/database.php
@@ -5,24 +5,19 @@ declare(strict_types=1);
return [
"default" => env("DB_CONNECTION", "mysql"),
"connections" => [
- "mysql" => [
- "driver" => "mysql",
- "url" => env("DATABASE_URL"),
- "host" => env("DB_HOST", "127.0.0.1"),
- "port" => env("DB_PORT", "3306"),
- "database" => env("DB_DATABASE", "forge"),
- "username" => env("DB_USERNAME", "forge"),
- "password" => env("DB_PASSWORD", ""),
- "unix_socket" => env("DB_SOCKET", ""),
- "charset" => "utf8mb4",
- "collation" => "utf8mb4_unicode_ci",
- "prefix" => "",
- "prefix_indexes" => true,
- "strict" => true,
- "engine" => null,
- "options" => extension_loaded("pdo_mysql") ? array_filter([
- PDO::MYSQL_ATTR_SSL_CA => env("MYSQL_ATTR_SSL_CA"),
- ]) : [],
+ 'pgsql' => [
+ 'driver' => 'pgsql',
+ 'url' => env('DATABASE_URL'),
+ 'host' => env('DB_HOST', '127.0.0.1'),
+ 'port' => env('DB_PORT', '5432'),
+ 'database' => env('DB_DATABASE', 'forge'),
+ 'username' => env('DB_USERNAME', 'forge'),
+ 'password' => env('DB_PASSWORD', ''),
+ 'charset' => 'utf8',
+ 'prefix' => '',
+ 'prefix_indexes' => true,
+ 'search_path' => 'public',
+ 'sslmode' => 'prefer',
],
],
"migrations" => "migrations",
diff --git a/docker-compose.yml b/docker-compose.yml
index 7fcec65..3c043ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,31 +35,31 @@ services:
restart: unless-stopped
database:
- image: mysql:8.0
+ image: postgres:13
container_name: toby-db-dev
environment:
- - MYSQL_ROOT_PASSWORD=${DOCKER_DEV_DB_ROOT_PASSWORD}
- - MYSQL_DATABASE=${DOCKER_DEV_DB_DATABASE}
- - MYSQL_USER=${DOCKER_DEV_DB_USERNAME}
- - MYSQL_PASSWORD=${DOCKER_DEV_DB_PASSWORD}
+ - PGPASSWORD=${DOCKER_DEV_DB_ROOT_PASSWORD}
+ - POSTGRES_DB=${DOCKER_DEV_DB_DATABASE}
+ - POSTGRES_USER=${DOCKER_DEV_DB_USERNAME}
+ - POSTGRES_PASSWORD=${DOCKER_DEV_DB_PASSWORD}
ports:
- - ${DOCKER_DEV_DB_EXTERNAL_PORT:-3306}:3306
+ - ${DOCKER_DEV_DB_EXTERNAL_PORT:-5432}:5432
volumes:
- - toby-mysql-data:/var/lib/mysql
+ - toby-pgsql-data:/var/lib/pgsql
networks:
- toby-dev
restart: unless-stopped
database-test:
- image: mysql:8.0
+ image: postgres:13
container_name: toby-db-test
environment:
- - MYSQL_ROOT_PASSWORD=${DOCKER_TEST_DB_ROOT_PASSWORD}
- - MYSQL_DATABASE=${DOCKER_TEST_DB_DATABASE}
- - MYSQL_USER=${DOCKER_TEST_DB_USERNAME}
- - MYSQL_PASSWORD=${DOCKER_TEST_DB_PASSWORD}
+ - PGPASSWORD=${DOCKER_TEST_DB_ROOT_PASSWORD}
+ - POSTGRES_DB=${DOCKER_TEST_DB_DATABASE}
+ - POSTGRES_USER=${DOCKER_TEST_DB_USERNAME}
+ - POSTGRES_PASSWORD=${DOCKER_TEST_DB_PASSWORD}
ports:
- - ${DOCKER_TEST_DB_EXTERNAL_PORT:-3307}:3306
+ - ${DOCKER_TEST_DB_EXTERNAL_PORT:-5433}:5432
networks:
- toby-dev
restart: unless-stopped
@@ -97,5 +97,5 @@ networks:
driver: bridge
volumes:
- toby-mysql-data:
- name: toby-mysql-data
+ toby-pgsql-data:
+ name: toby-pgsql-data
diff --git a/docker/dev/php/Dockerfile b/docker/dev/php/Dockerfile
index b6cd37d..223f816 100644
--- a/docker/dev/php/Dockerfile
+++ b/docker/dev/php/Dockerfile
@@ -10,10 +10,12 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
;fi
RUN apk --no-cache add \
+ postgresql-dev \
zip \
libzip-dev \
libpng-dev \
&& docker-php-ext-install \
+ pdo_pgsql \
zip \
gd \
&& docker-php-ext-configure \
diff --git a/phpunit.xml b/phpunit.xml
index c1b2a5c..0b25bbc 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -22,7 +22,7 @@
-
+