Skip to content

Commit 1c54fb8

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18768 from MauricioFauth/resources-sql-dir
Move ./sql directory to ./resources/sql
2 parents e10961d + a4fad24 commit 1c54fb8

10 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎doc/config.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ Server connection settings
959959
transformation system to work. phpMyAdmin will upgrade it automatically
960960
for you by analyzing your current column\_info table structure.
961961
However, if something goes wrong with the auto-upgrade then you can
962-
use the SQL script found in ``./sql/upgrade_column_info_4_3_0+.sql``
962+
use the SQL script found in ``./resources/sql/upgrade_column_info_4_3_0+.sql``
963963
to upgrade it manually.
964964

965965
To allow the usage of this functionality:
@@ -979,7 +979,7 @@ Server connection settings
979979
ADD `transformation` VARCHAR( 255 ) NOT NULL,
980980
ADD `transformation_options` VARCHAR( 255 ) NOT NULL;
981981
* to update your PRE-4.3.0 Column\_info table manually use this
982-
``./sql/upgrade_column_info_4_3_0+.sql`` SQL script.
982+
``./resources/sql/upgrade_column_info_4_3_0+.sql`` SQL script.
983983

984984
This feature can be disabled by setting the configuration to ``false``.
985985

‎doc/faq.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ A list of files and corresponding functionality which degrade gracefully when re
693693
* :file:`./doc/` (documentation)
694694
* :file:`./setup/` (setup script)
695695
* :file:`./examples/` (configuration examples)
696-
* :file:`./sql/` (SQL scripts to configure advanced functionalities)
696+
* :file:`./resources/sql/` (SQL scripts to configure advanced functionalities)
697697
* :file:`./js/src/` (Source files to re-build `./js/dist/`)
698698
* :file:`./js/global.d.ts` JS type declaration file
699699
* Run `rm -rv vendor/tecnickcom/tcpdf && composer dump-autoload --no-interaction --optimize --dev` (exporting to PDF)

‎doc/setup.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -856,27 +856,27 @@ The following three scenarios are covered by the Zero Configuration mode:
856856
Manual configuration
857857
--------------------
858858

859-
Please look at your ``./sql/`` directory, where you should find a
859+
Please look at your ``./resources/sql/`` directory, where you should find a
860860
file called *create\_tables.sql*. (If you are using a Windows server,
861861
pay special attention to :ref:`faq1_23`).
862862

863863
If you already had this infrastructure and:
864864

865865
* upgraded to MySQL 4.1.2 or newer, please use
866-
:file:`sql/upgrade_tables_mysql_4_1_2+.sql`.
866+
:file:`resources/sql/upgrade_tables_mysql_4_1_2+.sql`.
867867
* upgraded to phpMyAdmin 4.3.0 or newer from 2.5.0 or newer (<= 4.2.x),
868-
please use :file:`sql/upgrade_column_info_4_3_0+.sql`.
868+
please use :file:`resources/sql/upgrade_column_info_4_3_0+.sql`.
869869
* upgraded to phpMyAdmin 4.7.0 or newer from 4.3.0 or newer,
870-
please use :file:`sql/upgrade_tables_4_7_0+.sql`.
870+
please use :file:`resources/sql/upgrade_tables_4_7_0+.sql`.
871871

872-
and then create new tables by importing :file:`sql/create_tables.sql`.
872+
and then create new tables by importing :file:`resources/sql/create_tables.sql`.
873873

874874
You can use your phpMyAdmin to create the tables for you. Please be
875875
aware that you may need special (administrator) privileges to create
876876
the database and tables, and that the script may need some tuning,
877877
depending on the database name.
878878

879-
After having imported the :file:`sql/create_tables.sql` file, you
879+
After having imported the :file:`resources/sql/create_tables.sql` file, you
880880
should specify the table names in your :file:`config.inc.php` file. The
881881
directives used for that can be found in the :ref:`config`.
882882

@@ -944,12 +944,12 @@ The complete upgrade can be performed in a few simple steps:
944944
If you have upgraded your MySQL server from a version previous to 4.1.2 to
945945
version 5.x or newer and if you use the phpMyAdmin configuration storage, you
946946
should run the :term:`SQL` script found in
947-
:file:`sql/upgrade_tables_mysql_4_1_2+.sql`.
947+
:file:`resources/sql/upgrade_tables_mysql_4_1_2+.sql`.
948948

949949
If you have upgraded your phpMyAdmin to 4.3.0 or newer from 2.5.0 or
950950
newer (<= 4.2.x) and if you use the phpMyAdmin configuration storage, you
951951
should run the :term:`SQL` script found in
952-
:file:`sql/upgrade_column_info_4_3_0+.sql`.
952+
:file:`resources/sql/upgrade_column_info_4_3_0+.sql`.
953953

954954
Do not forget to clear the browser cache and to empty the old session by
955955
logging out and logging in again.

‎libraries/vendor_config.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
/**
3939
* Directory where SQL scripts to create/upgrade configuration storage reside.
4040
*/
41-
'sqlDir' => ROOT_PATH . 'sql' . DIRECTORY_SEPARATOR,
41+
'sqlDir' => ROOT_PATH . 'resources' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR,
4242

4343
/**
4444
* Filename of a configuration file.

sql/create_tables.sql renamed to resources/sql/create_tables.sql

File renamed without changes.

sql/upgrade_column_info_4_3_0+.sql renamed to resources/sql/upgrade_column_info_4_3_0+.sql

File renamed without changes.

sql/upgrade_tables_4_7_0+.sql renamed to resources/sql/upgrade_tables_4_7_0+.sql

File renamed without changes.

sql/upgrade_tables_mysql_4_1_2+.sql renamed to resources/sql/upgrade_tables_mysql_4_1_2+.sql

File renamed without changes.

‎scripts/check-release-excludes.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ validateExtension() {
8080
foundFileExt
8181
fi
8282
;;
83-
sql/*)
83+
resources/sql/*)
8484
if [ "${extension}" != "sql" ]; then
8585
foundFileExt
8686
fi

‎src/Config/Settings/Server.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ final class Server
476476

477477
/**
478478
* Database used for Relation, Bookmark and PDF Features
479-
* (see sql/create_tables.sql)
479+
* (see resources/sql/create_tables.sql)
480480
* - leave blank for no support
481481
* SUGGESTED: 'phpmyadmin'
482482
*

0 commit comments

Comments
 (0)