From 9363b60fcbe995e2b4b6d9c0c3d2eeac52c6fc1d Mon Sep 17 00:00:00 2001 From: colemanw Date: Tue, 2 Jan 2024 21:07:26 -0500 Subject: [PATCH] Regenerate ext DAO files using updated civix Uses the update from https://github.com/totten/civix/pull/328 to add FKColumnName metadata. --- .../core/CRM/Afform/DAO/AfformSubmission.php | 3 +- ext/civigrant/CRM/Grant/DAO/Grant.php | 4 +- .../CRM/OAuth/DAO/OAuthClient.php | 87 +++++++---- .../CRM/OAuth/DAO/OAuthContactToken.php | 147 ++++++++++++------ .../CRM/OAuth/DAO/OAuthSysToken.php | 139 +++++++++++------ ext/oauth-client/sql/auto_uninstall.sql | 6 +- .../CRM/Search/DAO/SearchDisplay.php | 3 +- .../CRM/Standaloneusers/DAO/User.php | 4 +- .../CRM/Standaloneusers/DAO/UserRole.php | 4 +- 9 files changed, 263 insertions(+), 134 deletions(-) diff --git a/ext/afform/core/CRM/Afform/DAO/AfformSubmission.php b/ext/afform/core/CRM/Afform/DAO/AfformSubmission.php index 3e0053f4da..5919d5a088 100644 --- a/ext/afform/core/CRM/Afform/DAO/AfformSubmission.php +++ b/ext/afform/core/CRM/Afform/DAO/AfformSubmission.php @@ -6,7 +6,7 @@ * * Generated from org.civicrm.afform/xml/schema/CRM/Afform/AfformSubmission.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:4dc8f836ce9420d461111dcaaebbb37a) + * (GenCodeChecksum:7f2d888fb07086aae91b0c864f9dedde) */ use CRM_Afform_ExtensionUtil as E; @@ -155,6 +155,7 @@ class CRM_Afform_DAO_AfformSubmission extends CRM_Core_DAO { 'bao' => 'CRM_Afform_DAO_AfformSubmission', 'localizable' => 0, 'FKClassName' => 'CRM_Contact_DAO_Contact', + 'FKColumnName' => 'id', 'html' => [ 'type' => 'EntityRef', ], diff --git a/ext/civigrant/CRM/Grant/DAO/Grant.php b/ext/civigrant/CRM/Grant/DAO/Grant.php index 5131367f28..3e1c6c18ae 100644 --- a/ext/civigrant/CRM/Grant/DAO/Grant.php +++ b/ext/civigrant/CRM/Grant/DAO/Grant.php @@ -6,7 +6,7 @@ * * Generated from civigrant/xml/schema/CRM/Grant/Grant.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:8c32dd9b0de6a449d6ee2358a2b043fc) + * (GenCodeChecksum:6572f413192bdc6c45725ba54fb7f124) */ use CRM_Grant_ExtensionUtil as E; @@ -264,6 +264,7 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'bao' => 'CRM_Grant_DAO_Grant', 'localizable' => 0, 'FKClassName' => 'CRM_Contact_DAO_Contact', + 'FKColumnName' => 'id', 'html' => [ 'type' => 'EntityRef', 'label' => E::ts("Contact"), @@ -601,6 +602,7 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { 'bao' => 'CRM_Grant_DAO_Grant', 'localizable' => 0, 'FKClassName' => 'CRM_Financial_DAO_FinancialType', + 'FKColumnName' => 'id', 'html' => [ 'type' => 'Select', 'label' => E::ts("Financial Type"), diff --git a/ext/oauth-client/CRM/OAuth/DAO/OAuthClient.php b/ext/oauth-client/CRM/OAuth/DAO/OAuthClient.php index eb8826a22f..6f81713ea1 100644 --- a/ext/oauth-client/CRM/OAuth/DAO/OAuthClient.php +++ b/ext/oauth-client/CRM/OAuth/DAO/OAuthClient.php @@ -6,7 +6,7 @@ * * Generated from oauth-client/xml/schema/CRM/OAuth/OAuthClient.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:547088257f723e251fbec42e97c710bb) + * (GenCodeChecksum:55f119ab0f95efaa97a6abac23471657) */ use CRM_OAuth_ExtensionUtil as E; @@ -143,6 +143,12 @@ class CRM_OAuth_DAO_OAuthClient extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => E::ts('Internal Client ID'), 'description' => E::ts('Internal Client ID'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_client.id', 'table_name' => 'civicrm_oauth_client', 'entity' => 'OAuthClient', @@ -159,6 +165,12 @@ class CRM_OAuth_DAO_OAuthClient extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_client.provider', 'table_name' => 'civicrm_oauth_client', 'entity' => 'OAuthClient', @@ -177,6 +189,12 @@ class CRM_OAuth_DAO_OAuthClient extends CRM_Core_DAO { 'required' => TRUE, 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_client.guid', 'table_name' => 'civicrm_oauth_client', 'entity' => 'OAuthClient', @@ -191,6 +209,12 @@ class CRM_OAuth_DAO_OAuthClient extends CRM_Core_DAO { 'description' => E::ts('Tenant ID'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_client.tenant', 'permission' => [ 'manage OAuth client', @@ -206,6 +230,12 @@ class CRM_OAuth_DAO_OAuthClient extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Client Secret'), 'description' => E::ts('Client Secret'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_client.secret', 'permission' => [ 'manage OAuth client', @@ -221,6 +251,12 @@ class CRM_OAuth_DAO_OAuthClient extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Options'), 'description' => E::ts('Extra override options for the service (JSON)'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_client.options', 'permission' => [ 'manage OAuth client', @@ -238,6 +274,12 @@ class CRM_OAuth_DAO_OAuthClient extends CRM_Core_DAO { 'title' => E::ts('Is Active'), 'description' => E::ts('Is the client currently enabled?'), 'required' => TRUE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_client.is_active', 'default' => '1', 'table_name' => 'civicrm_oauth_client', @@ -256,6 +298,12 @@ class CRM_OAuth_DAO_OAuthClient extends CRM_Core_DAO { 'title' => E::ts('Created Date'), 'description' => E::ts('When the client was created.'), 'required' => TRUE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_client.created_date', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_oauth_client', @@ -270,6 +318,12 @@ class CRM_OAuth_DAO_OAuthClient extends CRM_Core_DAO { 'title' => E::ts('Modified Date'), 'description' => E::ts('When the client was created or modified.'), 'required' => TRUE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_client.modified_date', 'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 'table_name' => 'civicrm_oauth_client', @@ -284,37 +338,6 @@ class CRM_OAuth_DAO_OAuthClient extends CRM_Core_DAO { return Civi::$statics[__CLASS__]['fields']; } - /** - * Return a mapping from field-name to the corresponding key (as used in fields()). - * - * @return array - * Array(string $name => string $uniqueName). - */ - public static function &fieldKeys() { - if (!isset(Civi::$statics[__CLASS__]['fieldKeys'])) { - Civi::$statics[__CLASS__]['fieldKeys'] = array_flip(CRM_Utils_Array::collect('name', self::fields())); - } - return Civi::$statics[__CLASS__]['fieldKeys']; - } - - /** - * Returns the names of this table - * - * @return string - */ - public static function getTableName() { - return self::$_tableName; - } - - /** - * Returns if this table needs to be logged - * - * @return bool - */ - public function getLog() { - return self::$_log; - } - /** * Returns the list of fields that can be imported * diff --git a/ext/oauth-client/CRM/OAuth/DAO/OAuthContactToken.php b/ext/oauth-client/CRM/OAuth/DAO/OAuthContactToken.php index 1031036c9e..eb8fa5bf9f 100644 --- a/ext/oauth-client/CRM/OAuth/DAO/OAuthContactToken.php +++ b/ext/oauth-client/CRM/OAuth/DAO/OAuthContactToken.php @@ -6,7 +6,7 @@ * * Generated from oauth-client/xml/schema/CRM/OAuth/OAuthContactToken.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:e94388515cadc3bb149a0339ef42acdb) + * (GenCodeChecksum:6885f971faa7321a84c20d1dee69102e) */ use CRM_OAuth_ExtensionUtil as E; @@ -193,22 +193,6 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { return $plural ? E::ts('OAuth Contact Tokens') : E::ts('OAuth Contact Token'); } - /** - * Returns foreign keys and entity references. - * - * @return array - * [CRM_Core_Reference_Interface] - */ - public static function getReferenceColumns() { - if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); - Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'client_id', 'civicrm_oauth_client', 'id'); - Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'contact_id', 'civicrm_contact', 'id'); - CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); - } - return Civi::$statics[__CLASS__]['links']; - } - /** * Returns all the column names of this table * @@ -223,6 +207,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'title' => E::ts('Token ID'), 'description' => E::ts('Token ID'), 'required' => TRUE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.id', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', @@ -238,6 +228,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'description' => E::ts('The tag specifies how this token will be used.'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.tag', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', @@ -250,12 +246,19 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => E::ts('Client ID'), 'description' => E::ts('Client ID'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.client_id', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', 'bao' => 'CRM_OAuth_DAO_OAuthContactToken', 'localizable' => 0, 'FKClassName' => 'CRM_OAuth_DAO_OAuthClient', + 'FKColumnName' => 'id', 'add' => '5.35', ], 'contact_id' => [ @@ -263,12 +266,19 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => E::ts('Contact ID'), 'description' => E::ts('Contact ID'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.contact_id', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', 'bao' => 'CRM_OAuth_DAO_OAuthContactToken', 'localizable' => 0, 'FKClassName' => 'CRM_Contact_DAO_Contact', + 'FKColumnName' => 'id', 'add' => '5.35', ], 'grant_type' => [ @@ -278,6 +288,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'description' => E::ts('Ex: authorization_code'), 'maxlength' => 31, 'size' => CRM_Utils_Type::MEDIUM, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.grant_type', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', @@ -290,6 +306,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Scopes'), 'description' => E::ts('List of scopes addressed by this token'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.scopes', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', @@ -305,6 +327,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'description' => E::ts('Ex: Bearer or MAC'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.token_type', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', @@ -317,6 +345,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Access Token'), 'description' => E::ts('Token to present when accessing resources'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.access_token', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', @@ -329,6 +363,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => E::ts('Expiration time'), 'description' => E::ts('Expiration time for the access_token (seconds since epoch)'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.expires', 'default' => '0', 'table_name' => 'civicrm_oauth_contact_token', @@ -342,6 +382,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Refresh Token'), 'description' => E::ts('Token to present when refreshing the access_token'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.refresh_token', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', @@ -356,6 +402,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'description' => E::ts('Identifier for the resource owner. Structure varies by service.'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.resource_owner_name', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', @@ -368,6 +420,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Resource Owner'), 'description' => E::ts('Cached details describing the resource owner'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.resource_owner', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', @@ -381,6 +439,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Error'), 'description' => E::ts('?? copied from OAuthSysToken'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.error', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', @@ -394,6 +458,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Raw token'), 'description' => E::ts('The token response data, per AccessToken::jsonSerialize'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.raw', 'table_name' => 'civicrm_oauth_contact_token', 'entity' => 'OAuthContactToken', @@ -408,6 +478,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'title' => E::ts('Created Date'), 'description' => E::ts('When the token was created.'), 'required' => FALSE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.created_date', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_oauth_contact_token', @@ -422,6 +498,12 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { 'title' => E::ts('Modified Date'), 'description' => E::ts('When the token was created or modified.'), 'required' => FALSE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_contact_token.modified_date', 'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 'table_name' => 'civicrm_oauth_contact_token', @@ -436,37 +518,6 @@ class CRM_OAuth_DAO_OAuthContactToken extends CRM_Core_DAO { return Civi::$statics[__CLASS__]['fields']; } - /** - * Return a mapping from field-name to the corresponding key (as used in fields()). - * - * @return array - * Array(string $name => string $uniqueName). - */ - public static function &fieldKeys() { - if (!isset(Civi::$statics[__CLASS__]['fieldKeys'])) { - Civi::$statics[__CLASS__]['fieldKeys'] = array_flip(CRM_Utils_Array::collect('name', self::fields())); - } - return Civi::$statics[__CLASS__]['fieldKeys']; - } - - /** - * Returns the names of this table - * - * @return string - */ - public static function getTableName() { - return self::$_tableName; - } - - /** - * Returns if this table needs to be logged - * - * @return bool - */ - public function getLog() { - return self::$_log; - } - /** * Returns the list of fields that can be imported * diff --git a/ext/oauth-client/CRM/OAuth/DAO/OAuthSysToken.php b/ext/oauth-client/CRM/OAuth/DAO/OAuthSysToken.php index 9d3070cbf5..986a1a238e 100644 --- a/ext/oauth-client/CRM/OAuth/DAO/OAuthSysToken.php +++ b/ext/oauth-client/CRM/OAuth/DAO/OAuthSysToken.php @@ -6,7 +6,7 @@ * * Generated from oauth-client/xml/schema/CRM/OAuth/OAuthSysToken.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:5e1f78f265ffdd9101b9c5f76ed947f2) + * (GenCodeChecksum:c49a21f9f870878a7064211633414557) */ use CRM_OAuth_ExtensionUtil as E; @@ -184,21 +184,6 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { return $plural ? E::ts('OAuth Sys Tokens') : E::ts('OAuth Sys Token'); } - /** - * Returns foreign keys and entity references. - * - * @return array - * [CRM_Core_Reference_Interface] - */ - public static function getReferenceColumns() { - if (!isset(Civi::$statics[__CLASS__]['links'])) { - Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__); - Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'client_id', 'civicrm_oauth_client', 'id'); - CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']); - } - return Civi::$statics[__CLASS__]['links']; - } - /** * Returns all the column names of this table * @@ -213,6 +198,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'title' => E::ts('Token ID'), 'description' => E::ts('Token ID'), 'required' => TRUE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.id', 'table_name' => 'civicrm_oauth_systoken', 'entity' => 'OAuthSysToken', @@ -228,6 +219,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'description' => E::ts('The tag specifies how this token will be used.'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.tag', 'table_name' => 'civicrm_oauth_systoken', 'entity' => 'OAuthSysToken', @@ -240,12 +237,19 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => E::ts('Client ID'), 'description' => E::ts('Client ID'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.client_id', 'table_name' => 'civicrm_oauth_systoken', 'entity' => 'OAuthSysToken', 'bao' => 'CRM_OAuth_DAO_OAuthSysToken', 'localizable' => 0, 'FKClassName' => 'CRM_OAuth_DAO_OAuthClient', + 'FKColumnName' => 'id', 'add' => '5.32', ], 'grant_type' => [ @@ -255,6 +259,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'description' => E::ts('Ex: authorization_code'), 'maxlength' => 31, 'size' => CRM_Utils_Type::MEDIUM, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.grant_type', 'table_name' => 'civicrm_oauth_systoken', 'entity' => 'OAuthSysToken', @@ -267,6 +277,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Scopes'), 'description' => E::ts('List of scopes addressed by this token'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.scopes', 'table_name' => 'civicrm_oauth_systoken', 'entity' => 'OAuthSysToken', @@ -282,6 +298,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'description' => E::ts('Ex: Bearer or MAC'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.token_type', 'table_name' => 'civicrm_oauth_systoken', 'entity' => 'OAuthSysToken', @@ -294,6 +316,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Access Token'), 'description' => E::ts('Token to present when accessing resources'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.access_token', 'permission' => [ [ @@ -311,6 +339,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => E::ts('Expiration time'), 'description' => E::ts('Expiration time for the access_token (seconds since epoch)'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.expires', 'default' => '0', 'table_name' => 'civicrm_oauth_systoken', @@ -324,6 +358,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Refresh Token'), 'description' => E::ts('Token to present when refreshing the access_token'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.refresh_token', 'permission' => [ [ @@ -343,6 +383,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'description' => E::ts('Identifier for the resource owner. Structure varies by service.'), 'maxlength' => 128, 'size' => CRM_Utils_Type::HUGE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.resource_owner_name', 'table_name' => 'civicrm_oauth_systoken', 'entity' => 'OAuthSysToken', @@ -355,6 +401,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Resource Owner'), 'description' => E::ts('Cached details describing the resource owner'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.resource_owner', 'table_name' => 'civicrm_oauth_systoken', 'entity' => 'OAuthSysToken', @@ -368,6 +420,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Error'), 'description' => E::ts('List of scopes addressed by this token'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.error', 'table_name' => 'civicrm_oauth_systoken', 'entity' => 'OAuthSysToken', @@ -381,6 +439,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_TEXT, 'title' => E::ts('Raw token'), 'description' => E::ts('The token response data, per AccessToken::jsonSerialize'), + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.raw', 'table_name' => 'civicrm_oauth_systoken', 'entity' => 'OAuthSysToken', @@ -395,6 +459,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'title' => E::ts('Created Date'), 'description' => E::ts('When the token was created.'), 'required' => FALSE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.created_date', 'default' => 'CURRENT_TIMESTAMP', 'table_name' => 'civicrm_oauth_systoken', @@ -409,6 +479,12 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { 'title' => E::ts('Modified Date'), 'description' => E::ts('When the token was created or modified.'), 'required' => FALSE, + 'usage' => [ + 'import' => FALSE, + 'export' => FALSE, + 'duplicate_matching' => FALSE, + 'token' => FALSE, + ], 'where' => 'civicrm_oauth_systoken.modified_date', 'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 'table_name' => 'civicrm_oauth_systoken', @@ -423,37 +499,6 @@ class CRM_OAuth_DAO_OAuthSysToken extends CRM_Core_DAO { return Civi::$statics[__CLASS__]['fields']; } - /** - * Return a mapping from field-name to the corresponding key (as used in fields()). - * - * @return array - * Array(string $name => string $uniqueName). - */ - public static function &fieldKeys() { - if (!isset(Civi::$statics[__CLASS__]['fieldKeys'])) { - Civi::$statics[__CLASS__]['fieldKeys'] = array_flip(CRM_Utils_Array::collect('name', self::fields())); - } - return Civi::$statics[__CLASS__]['fieldKeys']; - } - - /** - * Returns the names of this table - * - * @return string - */ - public static function getTableName() { - return self::$_tableName; - } - - /** - * Returns if this table needs to be logged - * - * @return bool - */ - public function getLog() { - return self::$_log; - } - /** * Returns the list of fields that can be imported * diff --git a/ext/oauth-client/sql/auto_uninstall.sql b/ext/oauth-client/sql/auto_uninstall.sql index dac2c6f766..a3c96fd566 100644 --- a/ext/oauth-client/sql/auto_uninstall.sql +++ b/ext/oauth-client/sql/auto_uninstall.sql @@ -8,9 +8,11 @@ -- -- Generated from drop.tpl -- DO NOT EDIT. Generated by CRM_Core_CodeGen ----- /******************************************************* +-- +-- /******************************************************* +-- * +-- * Clean up the existing tables -- * --- * Clean up the existing tables-- * -- *******************************************************/ SET FOREIGN_KEY_CHECKS=0; diff --git a/ext/search_kit/CRM/Search/DAO/SearchDisplay.php b/ext/search_kit/CRM/Search/DAO/SearchDisplay.php index 6ab68bc979..87d70560ce 100644 --- a/ext/search_kit/CRM/Search/DAO/SearchDisplay.php +++ b/ext/search_kit/CRM/Search/DAO/SearchDisplay.php @@ -6,7 +6,7 @@ * * Generated from org.civicrm.search_kit/xml/schema/CRM/Search/SearchDisplay.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:0eed730a39d0aadd3f66f773692f5167) + * (GenCodeChecksum:a854166712346c616ee309d1cc3d03eb) */ use CRM_Search_ExtensionUtil as E; @@ -220,6 +220,7 @@ class CRM_Search_DAO_SearchDisplay extends CRM_Core_DAO { 'bao' => 'CRM_Search_DAO_SearchDisplay', 'localizable' => 0, 'FKClassName' => 'CRM_Contact_DAO_SavedSearch', + 'FKColumnName' => 'id', 'add' => '1.0', ], 'type' => [ diff --git a/ext/standaloneusers/CRM/Standaloneusers/DAO/User.php b/ext/standaloneusers/CRM/Standaloneusers/DAO/User.php index 925ef0bbb4..e8b612646d 100644 --- a/ext/standaloneusers/CRM/Standaloneusers/DAO/User.php +++ b/ext/standaloneusers/CRM/Standaloneusers/DAO/User.php @@ -6,7 +6,7 @@ * * Generated from standaloneusers/xml/schema/CRM/Standaloneusers/User.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:160d4c2dec0ea6b38e09c05cb183bfd0) + * (GenCodeChecksum:ffc15573377f7cc25f4df498d62fc185) */ use CRM_Standaloneusers_ExtensionUtil as E; @@ -231,6 +231,7 @@ class CRM_Standaloneusers_DAO_User extends CRM_Core_DAO { 'bao' => 'CRM_Standaloneusers_DAO_User', 'localizable' => 0, 'FKClassName' => 'CRM_Core_DAO_Domain', + 'FKColumnName' => 'id', 'html' => [ 'label' => E::ts("Domain"), ], @@ -301,6 +302,7 @@ class CRM_Standaloneusers_DAO_User extends CRM_Core_DAO { 'bao' => 'CRM_Standaloneusers_DAO_User', 'localizable' => 0, 'FKClassName' => 'CRM_Contact_DAO_Contact', + 'FKColumnName' => 'id', 'html' => [ 'type' => 'EntityRef', 'label' => E::ts("Contact"), diff --git a/ext/standaloneusers/CRM/Standaloneusers/DAO/UserRole.php b/ext/standaloneusers/CRM/Standaloneusers/DAO/UserRole.php index 1e33a65579..bca4afbcef 100644 --- a/ext/standaloneusers/CRM/Standaloneusers/DAO/UserRole.php +++ b/ext/standaloneusers/CRM/Standaloneusers/DAO/UserRole.php @@ -6,7 +6,7 @@ * * Generated from standaloneusers/xml/schema/CRM/Standaloneusers/UserRole.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:261a62783e6628b718b812b096080e69) + * (GenCodeChecksum:e639eab915fc9ac8649926d907213b3e) */ use CRM_Standaloneusers_ExtensionUtil as E; @@ -124,6 +124,7 @@ class CRM_Standaloneusers_DAO_UserRole extends CRM_Core_DAO { 'bao' => 'CRM_Standaloneusers_DAO_UserRole', 'localizable' => 0, 'FKClassName' => 'CRM_Standaloneusers_DAO_User', + 'FKColumnName' => 'id', 'html' => [ 'type' => 'EntityRef', 'label' => E::ts("User"), @@ -147,6 +148,7 @@ class CRM_Standaloneusers_DAO_UserRole extends CRM_Core_DAO { 'bao' => 'CRM_Standaloneusers_DAO_UserRole', 'localizable' => 0, 'FKClassName' => 'CRM_Standaloneusers_DAO_Role', + 'FKColumnName' => 'id', 'html' => [ 'type' => 'EntityRef', 'label' => E::ts("Role"), -- 2.25.1