Merge pull request #2 from civicrm/master

[civicrm-core.git] / CRM / Core / DAO / Country.php

diff --git a/CRM/Core/DAO/Country.php b/CRM/Core/DAO/Country.php
index 56e719371fdd94458cd6b251148deefe11802598..5087ed41384ba39150b4200078997003a990540f 100644 (file)
--- a/CRM/Core/DAO/Country.php
+++ b/CRM/Core/DAO/Country.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Country.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a7e07335fea6b1eea5894c119eaa1c4e)
+ * (GenCodeChecksum:367384a5604d933a66247bddb06e96bb)
  */
 
 /**
@@ -19,19 +19,19 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
    *
    * @var string
    */
-  static $_tableName = 'civicrm_country';
+  public static $_tableName = 'civicrm_country';
 
   /**
    * Should CiviCRM log any modifications to this table in the civicrm_log table.
    *
    * @var bool
    */
-  static $_log = FALSE;
+  public static $_log = FALSE;
 
   /**
    * Country Id
    *
-   * @var int unsigned
+   * @var int
    */
   public $id;
 
@@ -59,7 +59,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
   /**
    * Foreign key to civicrm_address_format.id.
    *
-   * @var int unsigned
+   * @var int
    */
   public $address_format_id;
 
@@ -80,14 +80,14 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
   /**
    * Foreign key to civicrm_worldregion.id.
    *
-   * @var int unsigned
+   * @var int
    */
   public $region_id;
 
   /**
    * Should state/province be displayed as abbreviation for contacts from this country?
    *
-   * @var boolean
+   * @var bool
    */
   public $is_province_abbreviated;
 
@@ -107,7 +107,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
    */
   public static function getReferenceColumns() {
     if (!isset(Civi::$statics[__CLASS__]['links'])) {
-      Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__);
+      Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__);
       Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'address_format_id', 'civicrm_address_format', 'id');
       Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'region_id', 'civicrm_worldregion', 'id');
       CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']);
@@ -129,6 +129,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
           'title' => ts('Country ID'),
           'description' => ts('Country Id'),
           'required' => TRUE,
+          'where' => 'civicrm_country.id',
           'table_name' => 'civicrm_country',
           'entity' => 'Country',
           'bao' => 'CRM_Core_BAO_Country',
@@ -158,6 +159,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
           'description' => ts('ISO Code'),
           'maxlength' => 2,
           'size' => CRM_Utils_Type::TWO,
+          'where' => 'civicrm_country.iso_code',
           'table_name' => 'civicrm_country',
           'entity' => 'Country',
           'bao' => 'CRM_Core_BAO_Country',
@@ -170,6 +172,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
           'description' => ts('National prefix to be used when dialing TO this country.'),
           'maxlength' => 4,
           'size' => CRM_Utils_Type::FOUR,
+          'where' => 'civicrm_country.country_code',
           'table_name' => 'civicrm_country',
           'entity' => 'Country',
           'bao' => 'CRM_Core_BAO_Country',
@@ -180,6 +183,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_INT,
           'title' => ts('Address Format'),
           'description' => ts('Foreign key to civicrm_address_format.id.'),
+          'where' => 'civicrm_country.address_format_id',
           'table_name' => 'civicrm_country',
           'entity' => 'Country',
           'bao' => 'CRM_Core_BAO_Country',
@@ -193,6 +197,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
           'description' => ts('International direct dialing prefix from within the country TO another country'),
           'maxlength' => 4,
           'size' => CRM_Utils_Type::FOUR,
+          'where' => 'civicrm_country.idd_prefix',
           'table_name' => 'civicrm_country',
           'entity' => 'Country',
           'bao' => 'CRM_Core_BAO_Country',
@@ -205,6 +210,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
           'description' => ts('Access prefix to call within a country to a different area'),
           'maxlength' => 4,
           'size' => CRM_Utils_Type::FOUR,
+          'where' => 'civicrm_country.ndd_prefix',
           'table_name' => 'civicrm_country',
           'entity' => 'Country',
           'bao' => 'CRM_Core_BAO_Country',
@@ -216,6 +222,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
           'title' => ts('World Region ID'),
           'description' => ts('Foreign key to civicrm_worldregion.id.'),
           'required' => TRUE,
+          'where' => 'civicrm_country.region_id',
           'table_name' => 'civicrm_country',
           'entity' => 'Country',
           'bao' => 'CRM_Core_BAO_Country',
@@ -226,13 +233,14 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
             'table' => 'civicrm_worldregion',
             'keyColumn' => 'id',
             'labelColumn' => 'name',
-          ]
+          ],
         ],
         'is_province_abbreviated' => [
           'name' => 'is_province_abbreviated',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Abbreviate Province?'),
           'description' => ts('Should state/province be displayed as abbreviation for contacts from this country?'),
+          'where' => 'civicrm_country.is_province_abbreviated',
           'default' => '0',
           'table_name' => 'civicrm_country',
           'entity' => 'Country',