diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-10-23 14:14:52 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-10-23 14:14:52 +0000 |
| commit | 0249a7e0f06e5a8a83b04cd82403de7986a64d7b (patch) | |
| tree | fac40c59143146b73f9215dfdc4cb955b94a57d3 /includes/db_schema | |
| parent | 69116898aac8c11d55fcfc6478d660f4960aaf0c (diff) | |
| download | webtrees-0249a7e0f06e5a8a83b04cd82403de7986a64d7b.tar.gz webtrees-0249a7e0f06e5a8a83b04cd82403de7986a64d7b.tar.bz2 webtrees-0249a7e0f06e5a8a83b04cd82403de7986a64d7b.zip | |
Relationship privacy - combine the separate gedcom-settings and user-settings into a user-gedcom-setting. This provides more flexibility and is much easier to understand.
Diffstat (limited to 'includes/db_schema')
| -rw-r--r-- | includes/db_schema/db_schema_3_4.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/includes/db_schema/db_schema_3_4.php b/includes/db_schema/db_schema_3_4.php index 3dd5ee74e2..01493464a9 100644 --- a/includes/db_schema/db_schema_3_4.php +++ b/includes/db_schema/db_schema_3_4.php @@ -42,14 +42,14 @@ if (!defined('WT_WEBTREES')) { define('WT_DB_SCHEMA_3_4', ''); self::exec( - "INSERT IGNORE INTO wt_user_gedcom_setting (user_id, gedcom_id, setting_name, setting_value)". + "INSERT IGNORE INTO `##user_gedcom_setting` (user_id, gedcom_id, setting_name, setting_value)". " SELECT u.user_id, g.gedcom_id, 'RELATIONSHIP_PATH_LENGTH', LEAST(us1.setting_value, gs1.setting_value)". - " FROM wt_user u". - " CROSS JOIN wt_gedcom g". - " LEFT JOIN wt_user_setting us1 ON (u.user_id =us1.user_id AND us1.setting_name='max_relation_path')". - " LEFT JOIN wt_user_setting us2 ON (u.user_id =us2.user_id AND us2.setting_name='relationship_privacy')". - " LEFT JOIN wt_gedcom_setting gs1 ON (g.gedcom_id=gs1.gedcom_id AND gs1.setting_name='MAX_RELATION_PATH_LENGTH')". - " LEFT JOIN wt_gedcom_setting gs2 ON (g.gedcom_id=gs2.gedcom_id AND gs2.setting_name='USE_RELATIONSHIP_PRIVACY')". + " FROM ##user u". + " CROSS JOIN `##gedcom` g". + " LEFT JOIN `##user_setting` us1 ON (u.user_id =us1.user_id AND us1.setting_name='max_relation_path')". + " LEFT JOIN `##user_setting` us2 ON (u.user_id =us2.user_id AND us2.setting_name='relationship_privacy')". + " LEFT JOIN `##gedcom_setting` gs1 ON (g.gedcom_id=gs1.gedcom_id AND gs1.setting_name='MAX_RELATION_PATH_LENGTH')". + " LEFT JOIN `##gedcom_setting` gs2 ON (g.gedcom_id=gs2.gedcom_id AND gs2.setting_name='USE_RELATIONSHIP_PRIVACY')". " WHERE us2.setting_value AND gs2.setting_value" ); |