Merge branch 'prod-psql'

ArmaForces · Oct 21, 2023 · 3a0ed03 · 3a0ed03
2 parents a3e4c42 + 37d85e7
commit 3a0ed03
Show file tree

Hide file tree

Showing 33 changed files with 310 additions and 950 deletions.
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -36,13 +36,14 @@ RUN set -eux; \
         icu-dev \
         libzip-dev \
         zlib-dev \
+        postgresql-dev \
     ; \
     \
     docker-php-ext-configure zip; \
     docker-php-ext-install -j$(nproc) \
         intl \
         zip \
-        pdo_mysql \
+        pdo_pgsql \
     ; \
     pecl install \
         apcu-${APCU_VERSION} \

diff --git a/.docker/mysql/vars.env b/.docker/mysql/vars.env
diff --git a/.docker/pgsql/vars.env b/.docker/pgsql/vars.env
@@ -0,0 +1,3 @@
+POSTGRES_DB=af_website
+POSTGRES_USER=user
+POSTGRES_PASSWORD=password
diff --git a/.env b/.env
@@ -40,7 +40,7 @@ APP_SECRET=3c0e1589d36f2c28609e4ec5af60f545
 ###> doctrine/doctrine-bundle ###
 # Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
-DATABASE_URL=mysql://root@mysql:3306/af_website?serverVersion=5.7
+DATABASE_URL="postgresql://user:password@pgsql:5432/af_website?serverVersion=16&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/mailer ###

diff --git a/config/doctrine/AbstractBlamableEntity.orm.xml b/config/doctrine/AbstractBlamableEntity.orm.xml
@@ -12,7 +12,7 @@
             </cascade>
         </many-to-one>
 
-        <field name="lastUpdatedAt" type="datetime_immutable" nullable="true"/>
+        <field name="lastUpdatedAt" type="datetimetz_immutable" nullable="true"/>
         <many-to-one field="lastUpdatedBy" target-entity="App\Entity\User\User">
             <join-column name="last_updated_by" referenced-column-name="id"/>
             <cascade>

diff --git a/config/doctrine/AbstractEntity.orm.xml b/config/doctrine/AbstractEntity.orm.xml
@@ -6,7 +6,7 @@
 
     <mapped-superclass name="App\Entity\AbstractEntity">
         <id name="id" type="uuid"/>
-        <field name="createdAt" type="datetime_immutable"/>
+        <field name="createdAt" type="datetimetz_immutable"/>
 
         <indexes>
             <index columns="created_at"/>

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -19,12 +19,12 @@ services:
         volumes:
             - './public:/www/app/public:ro'
 
-    mysql:
-        image: mysql:5.7
+    pgsql:
+        image: postgres:16.0-alpine
         env_file:
-            - .docker/mysql/vars.env
+            - .docker/pgsql/vars.env
         ports:
-            - "33060:3306"
+            - "5432:5432"
 
     imgproxy:
         image: darthsim/imgproxy:v2

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -22,13 +22,13 @@ services:
             - './phpstan.neon.dist:/www/app/phpstan.neon.dist:ro'
 
         depends_on:
-            - mysql
+            - pgsql
 
-    mysql:
-        image: mysql:5.7
+    pgsql:
+        image: postgres:16.0-alpine
         env_file:
-            - .docker/mysql/vars.env
+            - .docker/pgsql/vars.env
         environment:
-            MYSQL_DATABASE: 'af_website_test'
+            POSTGRES_DB: 'af_website_test'
         ports:
-            - "3306:3306"
+            - "5432:5432"
diff --git a/migrations/Version20191230142218.php b/migrations/Version20191230142218.php
diff --git a/migrations/Version20200103010805.php b/migrations/Version20200103010805.php
diff --git a/migrations/Version20200123221244.php b/migrations/Version20200123221244.php
diff --git a/migrations/Version20200125110932.php b/migrations/Version20200125110932.php
diff --git a/migrations/Version20200510172618.php b/migrations/Version20200510172618.php