Merge pull request #1226 from FoalTS/drop-mariadb-support

Drop MariaDB support
FoalTS · Sep 3, 2023 · 3e97f9e · 3e97f9e
2 parents 1c0a979 + 415024f
commit 3e97f9e
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 307 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,16 +12,6 @@ services:
       MYSQL_PASSWORD: "test"
       MYSQL_DATABASE: "test"
 
-  mariadb:
-    image: "mariadb:10.2.32"
-    ports:
-      - "3307:3306"
-    environment:
-      MYSQL_ROOT_PASSWORD: "admin"
-      MYSQL_USER: "test"
-      MYSQL_PASSWORD: "test"
-      MYSQL_DATABASE: "test"
-
   postgres:
     image: "postgres:9.6.18"
     ports:
@@ -35,8 +25,8 @@ services:
     image: "mongo:4.0.18"
     ports:
       - "27017:27017"
-  
+
   redis:
     image: "redis:4.0.14"
     ports:
-      - "6380:6379"
+      - "6380:6379"
diff --git a/docs/docs/databases/typeorm/introduction.md b/docs/docs/databases/typeorm/introduction.md
@@ -49,7 +49,6 @@ FoalTS supports officially the following databases:
 | --- | --- | --- |
 | PostgreSQL | 9.6+ ([Version Policy](https://www.postgresql.org/support/versioning/)) | `pg@8` |
 | MySQL | 5.7+ ([Version Policy](https://en.wikipedia.org/wiki/MySQL#Release_history)) | `mysql@2` |
-| MariaDB | 10.2+ ([Version Policy](https://en.wikipedia.org/wiki/MariaDB#Versioning)) | `mysql@2` |
 | SQLite | 3 | `sqlite3@5` |
 | MongoDB | 4.0+ ([Version Policy](https://www.mongodb.com/support-policy)) | `mongodb@3` |
 
@@ -211,75 +210,6 @@ module.exports = {
 </TabItem>
 </Tabs>
 
-### MariaDB
-
-```sh
-npm install mysql
-```
-
-*config/default.{json|yml|js}*
-
-<Tabs
-  defaultValue="yaml"
-  values={[
-    {label: 'YAML', value: 'yaml'},
-    {label: 'JSON', value: 'json'},
-    {label: 'JS', value: 'js'},
-  ]}
->
-<TabItem value="yaml">
-
-```yaml
-# ...
-
-database:
-  type: mariadb
-  host: localhost
-  port: 3306
-  username: root
-  password: password
-  database: my-db
-```
-
-</TabItem>
-<TabItem value="json">
-
-```json
-{
-  // ...
-
-  "database": {
-    "type": "mariadb",
-    "host": "localhost",
-    "port": 3306,
-    "username": "root",
-    "password": "password",
-    "database": "my-db"
-  }
-}
-```
-
-</TabItem>
-<TabItem value="js">
-
-```javascript
-module.exports = {
-  // ...
-
-  database: {
-    type: "mariadb",
-    host: "localhost",
-    port: 3306,
-    username: "root",
-    password: "password",
-    database: "my-db"
-  }
-}
-```
-
-</TabItem>
-</Tabs>
-
 ## Configuration and Testing
 
 When running the command `npm run test` with the above configuration, FoalTS will try to retrieve the database configuration in this order:

diff --git a/...18n/es/docusaurus-plugin-content-docs/current/databases/typeorm/introduction.md b/...18n/es/docusaurus-plugin-content-docs/current/databases/typeorm/introduction.md
@@ -49,7 +49,6 @@ FoalTS supports officially the following databases:
 | --- | --- | --- |
 | PostgreSQL | 9.6+ ([Version Policy](https://www.postgresql.org/support/versioning/)) | `pg@8` |
 | MySQL | 5.7+ ([Version Policy](https://en.wikipedia.org/wiki/MySQL#Release_history)) | `mysql@2` |
-| MariaDB | 10.2+ ([Version Policy](https://en.wikipedia.org/wiki/MariaDB#Versioning)) | `mysql@2` |
 | SQLite | 3 | `sqlite3@5` |
 | MongoDB | 4.0+ ([Version Policy](https://www.mongodb.com/support-policy)) | `mongodb@3` |
 
@@ -211,75 +210,6 @@ module.exports = {
 </TabItem>
 </Tabs>
 
-### MariaDB
-
-```sh
-npm install mysql
-```
-
-*config/default.{json|yml|js}*
-
-<Tabs
-  defaultValue="yaml"
-  values={[
-    {label: 'YAML', value: 'yaml'},
-    {label: 'JSON', value: 'json'},
-    {label: 'JS', value: 'js'},
-  ]}
->
-<TabItem value="yaml">
-
-```yaml
-# ...
-
-database:
-  type: mariadb
-  host: localhost
-  port: 3306
-  username: root
-  password: password
-  database: my-db
-```
-
-</TabItem>
-<TabItem value="json">
-
-```json
-{
-  // ...
-
-  "database": {
-    "type": "mariadb",
-    "host": "localhost",
-    "port": 3306,
-    "username": "root",
-    "password": "password",
-    "database": "my-db"
-  }
-}
-```
-
-</TabItem>
-<TabItem value="js">
-
-```javascript
-module.exports = {
-  // ...
-
-  database: {
-    type: "mariadb",
-    host: "localhost",
-    port: 3306,
-    username: "root",
-    password: "password",
-    database: "my-db"
-  }
-}
-```
-
-</TabItem>
-</Tabs>
-
 ## Configuration and Testing
 
 When running the command `npm run test` with the above configuration, FoalTS will try to retrieve the database configuration in this order:

diff --git a/...18n/fr/docusaurus-plugin-content-docs/current/databases/typeorm/introduction.md b/...18n/fr/docusaurus-plugin-content-docs/current/databases/typeorm/introduction.md
@@ -49,7 +49,6 @@ FoalTS supports officially the following databases:
 | --- | --- | --- |
 | PostgreSQL | 9.6+ ([Version Policy](https://www.postgresql.org/support/versioning/)) | `pg@8` |
 | MySQL | 5.7+ ([Version Policy](https://en.wikipedia.org/wiki/MySQL#Release_history)) | `mysql@2` |
-| MariaDB | 10.2+ ([Version Policy](https://en.wikipedia.org/wiki/MariaDB#Versioning)) | `mysql@2` |
 | SQLite | 3 | `sqlite3@5` |
 | MongoDB | 4.0+ ([Version Policy](https://www.mongodb.com/support-policy)) | `mongodb@3` |
 
@@ -211,75 +210,6 @@ module.exports = {
 </TabItem>
 </Tabs>
 
-### MariaDB
-
-```sh
-npm install mysql
-```
-
-*config/default.{json|yml|js}*
-
-<Tabs
-  defaultValue="yaml"
-  values={[
-    {label: 'YAML', value: 'yaml'},
-    {label: 'JSON', value: 'json'},
-    {label: 'JS', value: 'js'},
-  ]}
->
-<TabItem value="yaml">
-
-```yaml
-# ...
-
-database:
-  type: mariadb
-  host: localhost
-  port: 3306
-  username: root
-  password: password
-  database: my-db
-```
-
-</TabItem>
-<TabItem value="json">
-
-```json
-{
-  // ...
-
-  "database": {
-    "type": "mariadb",
-    "host": "localhost",
-    "port": 3306,
-    "username": "root",
-    "password": "password",
-    "database": "my-db"
-  }
-}
-```
-
-</TabItem>
-<TabItem value="js">
-
-```javascript
-module.exports = {
-  // ...
-
-  database: {
-    type: "mariadb",
-    host: "localhost",
-    port: 3306,
-    username: "root",
-    password: "password",
-    database: "my-db"
-  }
-}
-```
-
-</TabItem>
-</Tabs>
-
 ## Configuration and Testing
 
 When running the command `npm run test` with the above configuration, FoalTS will try to retrieve the database configuration in this order:

diff --git a/...18n/id/docusaurus-plugin-content-docs/current/databases/typeorm/introduction.md b/...18n/id/docusaurus-plugin-content-docs/current/databases/typeorm/introduction.md
@@ -49,7 +49,6 @@ FoalTS supports officially the following databases:
 | --- | --- | --- |
 | PostgreSQL | 9.6+ ([Version Policy](https://www.postgresql.org/support/versioning/)) | `pg@8` |
 | MySQL | 5.7+ ([Version Policy](https://en.wikipedia.org/wiki/MySQL#Release_history)) | `mysql@2` |
-| MariaDB | 10.2+ ([Version Policy](https://en.wikipedia.org/wiki/MariaDB#Versioning)) | `mysql@2` |
 | SQLite | 3 | `sqlite3@5` |
 | MongoDB | 4.0+ ([Version Policy](https://www.mongodb.com/support-policy)) | `mongodb@3` |
 
@@ -211,75 +210,6 @@ module.exports = {
 </TabItem>
 </Tabs>
 
-### MariaDB
-
-```sh
-npm install mysql
-```
-
-*config/default.{json|yml|js}*
-
-<Tabs
-  defaultValue="yaml"
-  values={[
-    {label: 'YAML', value: 'yaml'},
-    {label: 'JSON', value: 'json'},
-    {label: 'JS', value: 'js'},
-  ]}
->
-<TabItem value="yaml">
-
-```yaml
-# ...
-
-database:
-  type: mariadb
-  host: localhost
-  port: 3306
-  username: root
-  password: password
-  database: my-db
-```
-
-</TabItem>
-<TabItem value="json">
-
-```json
-{
-  // ...
-
-  "database": {
-    "type": "mariadb",
-    "host": "localhost",
-    "port": 3306,
-    "username": "root",
-    "password": "password",
-    "database": "my-db"
-  }
-}
-```
-
-</TabItem>
-<TabItem value="js">
-
-```javascript
-module.exports = {
-  // ...
-
-  database: {
-    type: "mariadb",
-    host: "localhost",
-    port: 3306,
-    username: "root",
-    password: "password",
-    database: "my-db"
-  }
-}
-```
-
-</TabItem>
-</Tabs>
-
 ## Configuration and Testing
 
 When running the command `npm run test` with the above configuration, FoalTS will try to retrieve the database configuration in this order:

diff --git a/packages/typeorm/package.json b/packages/typeorm/package.json
@@ -23,7 +23,6 @@
     "FoalTS",
     "foal",
     "postgres",
-    "mariadb",
     "mongodb",
     "mysql",
     "sqlite",

diff --git a/packages/typeorm/src/entities/group.entity.spec.ts b/packages/typeorm/src/entities/group.entity.spec.ts
@@ -8,7 +8,7 @@ import { BaseEntity, DataSource, QueryFailedError } from 'typeorm';
 import { Group } from './group.entity';
 import { Permission } from './permission.entity';
 
-function testSuite(type: 'mysql' | 'mariadb' | 'postgres' | 'sqlite') {
+function testSuite(type: 'mysql' | 'postgres' | 'sqlite') {
 
   describe(`with ${type}`, () => {
 
@@ -17,7 +17,6 @@ function testSuite(type: 'mysql' | 'mariadb' | 'postgres' | 'sqlite') {
     before(async () => {
       switch (type) {
         case 'mysql':
-        case 'mariadb':
           dataSource = new DataSource({
             database: 'test',
             dropSchema: true,
@@ -201,7 +200,6 @@ function testSuite(type: 'mysql' | 'mariadb' | 'postgres' | 'sqlite') {
 describe('UserWithPermissions', () => {
 
   testSuite('mysql');
-  testSuite('mariadb');
   testSuite('sqlite');
   testSuite('postgres');