diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-02 16:34:55 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-02 16:34:55 +0100 |
| commit | 38af79dd30f87c3016a2f85d3343bb5f9bb5de7c (patch) | |
| tree | 2447c1f35c2eedfcaa1b60c9c151d3df61e027fb /phpBB/install/schemas/firebird_schema.sql | |
| parent | 8a6b961c54ea117ada9a85044840975d050c91b7 (diff) | |
| parent | a59d6e94a5bc30e99be5535632ccf2046817dd30 (diff) | |
| download | forums-38af79dd30f87c3016a2f85d3343bb5f9bb5de7c.tar forums-38af79dd30f87c3016a2f85d3343bb5f9bb5de7c.tar.gz forums-38af79dd30f87c3016a2f85d3343bb5f9bb5de7c.tar.bz2 forums-38af79dd30f87c3016a2f85d3343bb5f9bb5de7c.tar.xz forums-38af79dd30f87c3016a2f85d3343bb5f9bb5de7c.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop
* github-nickvergessen/ticket/11201: (50 commits)
[ticket/11201] Remove empty calls section from .yml
[ticket/11201] Split template file into multiple files
[ticket/11201] Remove dependency from types on the manager
[ticket/11201] Rename profilefields class to manager
[ticket/11201] Fix parameter description
[ticket/11201] Use !== null, its faster
[ticket/11201] Also translate profile fields in UCP and ACP
[ticket/11201] Add parameters and variables to profile field class
[ticket/11201] Add commas on last array entry
[ticket/11201] Allow translation of profile field name and explanation
[ticket/11201] Fix some variable names
[ticket/11201] Add tables to constructor in tests
[ticket/11201] Add a method to return the translated full name of the type
[ticket/11201] Remove db depending code from field class
[ticket/11201] Add variables to classes and add constructor doc blocks
[ticket/11201] Update copyright in class file
[ticket/11201] Add visibility and remove unused variable
[ticket/11201] Add some commas at the last array entry
[ticket/11201] Cast some variables to integer
[ticket/11201] Inject table names rather then using constants
...
Conflicts:
phpBB/config/services.yml
Diffstat (limited to 'phpBB/install/schemas/firebird_schema.sql')
| -rw-r--r-- | phpBB/install/schemas/firebird_schema.sql | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index 9cf6d877ad..791e4ce6b3 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -908,7 +908,7 @@ CREATE INDEX phpbb_privmsgs_to_usr_flder_id ON phpbb_privmsgs_to(user_id, folder CREATE TABLE phpbb_profile_fields ( field_id INTEGER NOT NULL, field_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, - field_type INTEGER DEFAULT 0 NOT NULL, + field_type VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, field_ident VARCHAR(20) CHARACTER SET NONE DEFAULT '' NOT NULL, field_length VARCHAR(20) CHARACTER SET NONE DEFAULT '' NOT NULL, field_minlen VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, @@ -957,7 +957,7 @@ CREATE TABLE phpbb_profile_fields_lang ( field_id INTEGER DEFAULT 0 NOT NULL, lang_id INTEGER DEFAULT 0 NOT NULL, option_id INTEGER DEFAULT 0 NOT NULL, - field_type INTEGER DEFAULT 0 NOT NULL, + field_type VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, lang_value VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE );; |