Skip to content

Commit dabd401

Browse files
oliverkleeSam Tuke
authored and
Sam Tuke
committed
[CLEANUP] Move the database schema to resources/ (#285)
This brings the project more in line with the default Symfony project structure.
1 parent 35ab8aa commit dabd401

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

.github/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ named `phplist`, and the password is `batterystaple`, the command looks like
9393
this:
9494

9595
```bash
96-
mysql -u phplist_test --password=batterystaple phplist_test < Database/Schema.sql
96+
mysql -u phplist_test --password=batterystaple phplist_test < resources/Database/Schema.sql
9797
```
9898

9999
For running the integration tests, please first enter the database name

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ before_install:
3636
echo "Creating the database and importing the database schema";
3737
mysql -e "CREATE DATABASE ${PHPLIST_DATABASE_NAME};";
3838
mysql -u root -e "GRANT ALL ON ${PHPLIST_DATABASE_NAME}.* TO '${PHPLIST_DATABASE_USER}'@'%';";
39-
mysql ${PHPLIST_DATABASE_NAME} < Database/Schema.sql;
39+
mysql ${PHPLIST_DATABASE_NAME} < resources/Database/Schema.sql;
4040
4141
install:
4242
- >

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
1818
- Move the PHPUnit configuration file (#283)
1919
- Rename the Composer package to "phplist/core" (#275)
2020
- Remove the obsolete core classes (#267)
21-
- Adopt more of the default Symfony project structure (#265, #268, #269, #270)
21+
- Adopt more of the default Symfony project structure (#265, #268, #269, #270, #285)
2222

2323
### Deprecated
2424

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,9 @@ please see the
101101
Any changes to the database schema must always be done both in phpList 3 and
102102
later versions so that both versions always have the same schema.
103103

104-
For changing the database schema, please edit `Database/Schema.sql` and adapt
105-
the corresponding domain model classes and repository classes accordingly.
104+
For changing the database schema, please edit `resources/Database/Schema.sql`
105+
and adapt the corresponding domain model classes and repository classes
106+
accordingly.
106107

107108

108109
## Developing phpList modules (plugins)
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)