ここの情報は古いです。ご理解頂いた上でお取り扱いください。

Changeset 11307


Ignore:
Timestamp:
Apr 15, 2009, 3:35:11 AM (13 years ago)
Author:
ebihara
Message:

#3765:fixed some models to work inviting correctly

Location:
OpenPNE3/branches/goto_doctrine
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE3/branches/goto_doctrine/config/doctrine/schema.yml

    r11262 r11307  
    8181      type: integer(4)
    8282      notnull: true
    83     is_friend: integer(1)
    84     is_friend_pre: integer(1)
    85     is_access_block: integer(1)
     83    is_friend: boolean
     84    is_friend_pre: boolean
     85    is_access_block: boolean
    8686  relations:
    8787    Member:
     
    156156      notnull: true
    157157    is_required:
    158       type: integer(1)
    159       default: '0'
     158      type: boolean
     159      default: false
    160160      notnull: true
    161161    is_unique:
    162       type: integer(1)
    163       default: '0'
     162      type: boolean
     163      default: false
    164164      notnull: true
    165165    is_edit_public_flag:
    166       type: integer(1)
    167       default: '0'
     166      type: boolean
     167      default: false
    168168      notnull: true
    169169    default_public_flag:
     
    180180      notnull: true
    181181    is_disp_regist:
    182       type: integer(1)
    183       default: '0'
     182      type: boolean
     183      default: false
    184184      notnull: true
    185185    is_disp_config:
    186       type: integer(1)
    187       default: '0'
     186      type: boolean
     187      default: false
    188188      notnull: true
    189189    is_disp_search:
    190       type: integer(1)
    191       default: '0'
     190      type: boolean
     191      default: false
    192192      notnull: true
    193193    value_regexp: string(2147483647)
     
    228228      type: integer(4)
    229229      notnull: true
    230     is_primary: integer(1)
     230    is_primary: boolean
    231231  relations:
    232232    Member:
     
    320320    is_allow_member_community:
    321321      type: boolean
    322       default: '1'
     322      default: true
    323323      notnull: true
    324324    tree_key: integer(4)
     
    443443      notnull: true
    444444    is_active:
    445       type: integer(1)
    446       default: '0'
     445      type: boolean
     446      default: false
    447447      notnull: true
    448448    invite_member_id: integer(4)
  • OpenPNE3/branches/goto_doctrine/lib/filter/doctrine/base/BaseMemberFormFilter.class.php

    r11208 r11307  
    1616    $this->setWidgets(array(
    1717      'name'             => new sfWidgetFormFilterInput(),
    18       'is_active'        => new sfWidgetFormFilterInput(),
     18      'is_active'        => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
    1919      'invite_member_id' => new sfWidgetFormDoctrineChoice(array('model' => 'Member', 'add_empty' => true)),
    2020      'created_at'       => new sfWidgetFormFilterDate(array('from_date' => new sfWidgetFormDate(), 'to_date' => new sfWidgetFormDate(), 'with_empty' => true)),
     
    2424    $this->setValidators(array(
    2525      'name'             => new sfValidatorPass(array('required' => false)),
    26       'is_active'        => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
     26      'is_active'        => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
    2727      'invite_member_id' => new sfValidatorDoctrineChoice(array('required' => false, 'model' => 'Member', 'column' => 'id')),
    2828      'created_at'       => new sfValidatorDateRange(array('required' => false, 'from_date' => new sfValidatorDate(array('required' => false)), 'to_date' => new sfValidatorDate(array('required' => false)))),
     
    4747      'id'               => 'Number',
    4848      'name'             => 'Text',
    49       'is_active'        => 'Number',
     49      'is_active'        => 'Boolean',
    5050      'invite_member_id' => 'ForeignKey',
    5151      'created_at'       => 'Date',
  • OpenPNE3/branches/goto_doctrine/lib/filter/doctrine/base/BaseMemberImageFormFilter.class.php

    r11208 r11307  
    1717      'member_id'  => new sfWidgetFormDoctrineChoice(array('model' => 'Member', 'add_empty' => true)),
    1818      'file_id'    => new sfWidgetFormDoctrineChoice(array('model' => 'File', 'add_empty' => true)),
    19       'is_primary' => new sfWidgetFormFilterInput(),
     19      'is_primary' => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
    2020    ));
    2121
     
    2323      'member_id'  => new sfValidatorDoctrineChoice(array('required' => false, 'model' => 'Member', 'column' => 'id')),
    2424      'file_id'    => new sfValidatorDoctrineChoice(array('required' => false, 'model' => 'File', 'column' => 'id')),
    25       'is_primary' => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
     25      'is_primary' => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
    2626    ));
    2727
     
    4444      'member_id'  => 'ForeignKey',
    4545      'file_id'    => 'ForeignKey',
    46       'is_primary' => 'Number',
     46      'is_primary' => 'Boolean',
    4747    );
    4848  }
  • OpenPNE3/branches/goto_doctrine/lib/filter/doctrine/base/BaseMemberRelationshipFormFilter.class.php

    r11208 r11307  
    1717      'member_id_to'    => new sfWidgetFormDoctrineChoice(array('model' => 'Member', 'add_empty' => true)),
    1818      'member_id_from'  => new sfWidgetFormDoctrineChoice(array('model' => 'Member', 'add_empty' => true)),
    19       'is_friend'       => new sfWidgetFormFilterInput(),
    20       'is_friend_pre'   => new sfWidgetFormFilterInput(),
    21       'is_access_block' => new sfWidgetFormFilterInput(),
     19      'is_friend'       => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
     20      'is_friend_pre'   => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
     21      'is_access_block' => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
    2222    ));
    2323
     
    2525      'member_id_to'    => new sfValidatorDoctrineChoice(array('required' => false, 'model' => 'Member', 'column' => 'id')),
    2626      'member_id_from'  => new sfValidatorDoctrineChoice(array('required' => false, 'model' => 'Member', 'column' => 'id')),
    27       'is_friend'       => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
    28       'is_friend_pre'   => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
    29       'is_access_block' => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
     27      'is_friend'       => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
     28      'is_friend_pre'   => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
     29      'is_access_block' => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
    3030    ));
    3131
     
    4848      'member_id_to'    => 'ForeignKey',
    4949      'member_id_from'  => 'ForeignKey',
    50       'is_friend'       => 'Number',
    51       'is_friend_pre'   => 'Number',
    52       'is_access_block' => 'Number',
     50      'is_friend'       => 'Boolean',
     51      'is_friend_pre'   => 'Boolean',
     52      'is_access_block' => 'Boolean',
    5353    );
    5454  }
  • OpenPNE3/branches/goto_doctrine/lib/filter/doctrine/base/BaseProfileFormFilter.class.php

    r11208 r11307  
    1616    $this->setWidgets(array(
    1717      'name'                => new sfWidgetFormFilterInput(),
    18       'is_required'         => new sfWidgetFormFilterInput(),
    19       'is_unique'           => new sfWidgetFormFilterInput(),
    20       'is_edit_public_flag' => new sfWidgetFormFilterInput(),
     18      'is_required'         => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
     19      'is_unique'           => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
     20      'is_edit_public_flag' => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
    2121      'default_public_flag' => new sfWidgetFormFilterInput(),
    2222      'form_type'           => new sfWidgetFormFilterInput(),
    2323      'value_type'          => new sfWidgetFormFilterInput(),
    24       'is_disp_regist'      => new sfWidgetFormFilterInput(),
    25       'is_disp_config'      => new sfWidgetFormFilterInput(),
    26       'is_disp_search'      => new sfWidgetFormFilterInput(),
     24      'is_disp_regist'      => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
     25      'is_disp_config'      => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
     26      'is_disp_search'      => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
    2727      'value_regexp'        => new sfWidgetFormFilterInput(),
    2828      'value_min'           => new sfWidgetFormFilterInput(),
     
    3333    $this->setValidators(array(
    3434      'name'                => new sfValidatorPass(array('required' => false)),
    35       'is_required'         => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
    36       'is_unique'           => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
    37       'is_edit_public_flag' => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
     35      'is_required'         => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
     36      'is_unique'           => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
     37      'is_edit_public_flag' => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
    3838      'default_public_flag' => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
    3939      'form_type'           => new sfValidatorPass(array('required' => false)),
    4040      'value_type'          => new sfValidatorPass(array('required' => false)),
    41       'is_disp_regist'      => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
    42       'is_disp_config'      => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
    43       'is_disp_search'      => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
     41      'is_disp_regist'      => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
     42      'is_disp_config'      => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
     43      'is_disp_search'      => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
    4444      'value_regexp'        => new sfValidatorPass(array('required' => false)),
    4545      'value_min'           => new sfValidatorPass(array('required' => false)),
     
    6565      'id'                  => 'Number',
    6666      'name'                => 'Text',
    67       'is_required'         => 'Number',
    68       'is_unique'           => 'Number',
    69       'is_edit_public_flag' => 'Number',
     67      'is_required'         => 'Boolean',
     68      'is_unique'           => 'Boolean',
     69      'is_edit_public_flag' => 'Boolean',
    7070      'default_public_flag' => 'Number',
    7171      'form_type'           => 'Text',
    7272      'value_type'          => 'Text',
    73       'is_disp_regist'      => 'Number',
    74       'is_disp_config'      => 'Number',
    75       'is_disp_search'      => 'Number',
     73      'is_disp_regist'      => 'Boolean',
     74      'is_disp_config'      => 'Boolean',
     75      'is_disp_search'      => 'Boolean',
    7676      'value_regexp'        => 'Text',
    7777      'value_min'           => 'Text',
  • OpenPNE3/branches/goto_doctrine/lib/form/doctrine/MemberConfigForm.class.php

    r11260 r11307  
    3636      $this->isNew = true;
    3737    }
     38
     39    $this->member->save();
    3840
    3941    parent::__construct(array(), $options, $CSRFSecret);
  • OpenPNE3/branches/goto_doctrine/lib/form/doctrine/base/BaseMemberForm.class.php

    r11219 r11307  
    1515      'id'               => new sfWidgetFormInputHidden(),
    1616      'name'             => new sfWidgetFormInput(),
    17       'is_active'        => new sfWidgetFormInput(),
     17      'is_active'        => new sfWidgetFormInputCheckbox(),
    1818      'invite_member_id' => new sfWidgetFormDoctrineChoice(array('model' => 'Member', 'add_empty' => true)),
    1919      'created_at'       => new sfWidgetFormDateTime(),
     
    2424      'id'               => new sfValidatorDoctrineChoice(array('model' => 'Member', 'column' => 'id', 'required' => false)),
    2525      'name'             => new sfValidatorString(array('max_length' => 64)),
    26       'is_active'        => new sfValidatorInteger(),
     26      'is_active'        => new sfValidatorBoolean(),
    2727      'invite_member_id' => new sfValidatorDoctrineChoice(array('model' => 'Member', 'required' => false)),
    2828      'created_at'       => new sfValidatorDateTime(array('required' => false)),
  • OpenPNE3/branches/goto_doctrine/lib/form/doctrine/base/BaseMemberImageForm.class.php

    r11219 r11307  
    1616      'member_id'  => new sfWidgetFormDoctrineChoice(array('model' => 'Member', 'add_empty' => false)),
    1717      'file_id'    => new sfWidgetFormDoctrineChoice(array('model' => 'File', 'add_empty' => false)),
    18       'is_primary' => new sfWidgetFormInput(),
     18      'is_primary' => new sfWidgetFormInputCheckbox(),
    1919    ));
    2020
     
    2323      'member_id'  => new sfValidatorDoctrineChoice(array('model' => 'Member')),
    2424      'file_id'    => new sfValidatorDoctrineChoice(array('model' => 'File')),
    25       'is_primary' => new sfValidatorInteger(array('required' => false)),
     25      'is_primary' => new sfValidatorBoolean(array('required' => false)),
    2626    ));
    2727
  • OpenPNE3/branches/goto_doctrine/lib/form/doctrine/base/BaseMemberRelationshipForm.class.php

    r11219 r11307  
    1616      'member_id_to'    => new sfWidgetFormDoctrineChoice(array('model' => 'Member', 'add_empty' => false)),
    1717      'member_id_from'  => new sfWidgetFormDoctrineChoice(array('model' => 'Member', 'add_empty' => false)),
    18       'is_friend'       => new sfWidgetFormInput(),
    19       'is_friend_pre'   => new sfWidgetFormInput(),
    20       'is_access_block' => new sfWidgetFormInput(),
     18      'is_friend'       => new sfWidgetFormInputCheckbox(),
     19      'is_friend_pre'   => new sfWidgetFormInputCheckbox(),
     20      'is_access_block' => new sfWidgetFormInputCheckbox(),
    2121    ));
    2222
     
    2525      'member_id_to'    => new sfValidatorDoctrineChoice(array('model' => 'Member')),
    2626      'member_id_from'  => new sfValidatorDoctrineChoice(array('model' => 'Member')),
    27       'is_friend'       => new sfValidatorInteger(array('required' => false)),
    28       'is_friend_pre'   => new sfValidatorInteger(array('required' => false)),
    29       'is_access_block' => new sfValidatorInteger(array('required' => false)),
     27      'is_friend'       => new sfValidatorBoolean(array('required' => false)),
     28      'is_friend_pre'   => new sfValidatorBoolean(array('required' => false)),
     29      'is_access_block' => new sfValidatorBoolean(array('required' => false)),
    3030    ));
    3131
  • OpenPNE3/branches/goto_doctrine/lib/form/doctrine/base/BaseProfileForm.class.php

    r11208 r11307  
    1515      'id'                  => new sfWidgetFormInputHidden(),
    1616      'name'                => new sfWidgetFormInput(),
    17       'is_required'         => new sfWidgetFormInput(),
    18       'is_unique'           => new sfWidgetFormInput(),
    19       'is_edit_public_flag' => new sfWidgetFormInput(),
     17      'is_required'         => new sfWidgetFormInputCheckbox(),
     18      'is_unique'           => new sfWidgetFormInputCheckbox(),
     19      'is_edit_public_flag' => new sfWidgetFormInputCheckbox(),
    2020      'default_public_flag' => new sfWidgetFormInput(),
    2121      'form_type'           => new sfWidgetFormInput(),
    2222      'value_type'          => new sfWidgetFormInput(),
    23       'is_disp_regist'      => new sfWidgetFormInput(),
    24       'is_disp_config'      => new sfWidgetFormInput(),
    25       'is_disp_search'      => new sfWidgetFormInput(),
     23      'is_disp_regist'      => new sfWidgetFormInputCheckbox(),
     24      'is_disp_config'      => new sfWidgetFormInputCheckbox(),
     25      'is_disp_search'      => new sfWidgetFormInputCheckbox(),
    2626      'value_regexp'        => new sfWidgetFormTextarea(),
    2727      'value_min'           => new sfWidgetFormInput(),
     
    3333      'id'                  => new sfValidatorDoctrineChoice(array('model' => 'Profile', 'column' => 'id', 'required' => false)),
    3434      'name'                => new sfValidatorString(array('max_length' => 64)),
    35       'is_required'         => new sfValidatorInteger(),
    36       'is_unique'           => new sfValidatorInteger(),
    37       'is_edit_public_flag' => new sfValidatorInteger(),
     35      'is_required'         => new sfValidatorBoolean(),
     36      'is_unique'           => new sfValidatorBoolean(),
     37      'is_edit_public_flag' => new sfValidatorBoolean(),
    3838      'default_public_flag' => new sfValidatorInteger(),
    3939      'form_type'           => new sfValidatorString(array('max_length' => 32)),
    4040      'value_type'          => new sfValidatorString(array('max_length' => 32)),
    41       'is_disp_regist'      => new sfValidatorInteger(),
    42       'is_disp_config'      => new sfValidatorInteger(),
    43       'is_disp_search'      => new sfValidatorInteger(),
     41      'is_disp_regist'      => new sfValidatorBoolean(),
     42      'is_disp_config'      => new sfValidatorBoolean(),
     43      'is_disp_search'      => new sfValidatorBoolean(),
    4444      'value_regexp'        => new sfValidatorString(array('max_length' => 2147483647, 'required' => false)),
    4545      'value_min'           => new sfValidatorString(array('max_length' => 32, 'required' => false)),
  • OpenPNE3/branches/goto_doctrine/lib/form/opAuthRegisterForm.class.php

    r11219 r11307  
    4747
    4848    $this->memberForm = new MemberForm($this->getMember());
    49     $this->profileForm = new MemberProfileForm($this->getMember()->getMemberProfiles());
     49    $this->profileForm = new MemberProfileForm($this->getMember()->getMemberProfile());
    5050    $this->profileForm->setRegisterWidgets();
    5151    $this->configForm = new MemberConfigForm($this->getMember());
  • OpenPNE3/branches/goto_doctrine/lib/model/doctrine/Member.class.php

    r11270 r11307  
    5757  public function getFriends($limit = null, $isRandom = false)
    5858  {
    59     $q = Doctrine::getTable('MemberRelationship')->createQuery()
    60         ->where('member_id_to = ?', $this->getId())
    61         ->andWhere('is_friend = ?', true)
    62         ->leftJoin('Member m ON member_id_from = m.member_id');
     59    $q = Doctrine::getTable('Member')->createQuery()
     60        ->where('mr.member_id_to = ?', $this->getId())
     61        ->andWhere('mr.is_friend = ?', true)
     62        ->leftJoin('Member.MemberRelationship mr ON mr.member_id_from = Member.id');
    6363
    6464    if (!is_null($limit))
  • OpenPNE3/branches/goto_doctrine/lib/model/doctrine/MemberConfig.class.php

    r11250 r11307  
    1919    }
    2020
    21     $pre = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId($name, $this->getMemberId());
     21    $pre = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId($name, $this->getMember()->getId());
    2222    if (!$pre)
    2323    {
     
    4343    }
    4444
    45     $pre = MemberConfigPeer::retrieveByNameAndMemberId($tokenName, $this->getMemberId());
     45    $pre = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId($tokenName, $this->getMemberId());
    4646    if (!$pre)
    4747    {
     
    5252    else
    5353    {
    54       $pre = MemberConfigPeer::retrieveByNameAndMemberId($tokenName, $this->getMemberId());
     54      $pre = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId($tokenName, $this->getMemberId());
    5555    }
    5656
  • OpenPNE3/branches/goto_doctrine/lib/model/doctrine/MemberRelationship.class.php

    r11250 r11307  
    6262
    6363    $this->setIsFriend(true);
    64     $result = $this->save();
    65     if (!$result) {
    66       return false;
    67     }
     64    $this->save();
    6865
    6966    $this->getToInstance()->setIsFriend(true);
  • OpenPNE3/branches/goto_doctrine/lib/model/doctrine/base/BaseCommunityCategory.class.php

    r11262 r11307  
    1111        $this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'primary' => true, 'autoincrement' => true, 'length' => '4'));
    1212        $this->hasColumn('name', 'string', 64, array('type' => 'string', 'default' => '', 'notnull' => true, 'length' => '64'));
    13         $this->hasColumn('is_allow_member_community', 'boolean', null, array('type' => 'boolean', 'default' => '1', 'notnull' => true));
     13        $this->hasColumn('is_allow_member_community', 'boolean', null, array('type' => 'boolean', 'default' => true, 'notnull' => true));
    1414        $this->hasColumn('tree_key', 'integer', 4, array('type' => 'integer', 'length' => '4'));
    1515        $this->hasColumn('sort_order', 'integer', 4, array('type' => 'integer', 'length' => '4'));
  • OpenPNE3/branches/goto_doctrine/lib/model/doctrine/base/BaseMember.class.php

    r11219 r11307  
    1111        $this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'primary' => true, 'autoincrement' => true, 'length' => '4'));
    1212        $this->hasColumn('name', 'string', 64, array('type' => 'string', 'default' => '', 'notnull' => true, 'length' => '64'));
    13         $this->hasColumn('is_active', 'integer', 1, array('type' => 'integer', 'default' => '0', 'notnull' => true, 'length' => '1'));
     13        $this->hasColumn('is_active', 'boolean', null, array('type' => 'boolean', 'default' => false, 'notnull' => true));
    1414        $this->hasColumn('invite_member_id', 'integer', 4, array('type' => 'integer', 'length' => '4'));
    1515
  • OpenPNE3/branches/goto_doctrine/lib/model/doctrine/base/BaseMemberImage.class.php

    r11219 r11307  
    1212        $this->hasColumn('member_id', 'integer', 4, array('type' => 'integer', 'notnull' => true, 'length' => '4'));
    1313        $this->hasColumn('file_id', 'integer', 4, array('type' => 'integer', 'notnull' => true, 'length' => '4'));
    14         $this->hasColumn('is_primary', 'integer', 1, array('type' => 'integer', 'length' => '1'));
     14        $this->hasColumn('is_primary', 'boolean', null, array('type' => 'boolean'));
    1515
    1616        $this->option('charset', 'utf8');
  • OpenPNE3/branches/goto_doctrine/lib/model/doctrine/base/BaseMemberRelationship.class.php

    r11219 r11307  
    1212        $this->hasColumn('member_id_to', 'integer', 4, array('type' => 'integer', 'notnull' => true, 'length' => '4'));
    1313        $this->hasColumn('member_id_from', 'integer', 4, array('type' => 'integer', 'notnull' => true, 'length' => '4'));
    14         $this->hasColumn('is_friend', 'integer', 1, array('type' => 'integer', 'length' => '1'));
    15         $this->hasColumn('is_friend_pre', 'integer', 1, array('type' => 'integer', 'length' => '1'));
    16         $this->hasColumn('is_access_block', 'integer', 1, array('type' => 'integer', 'length' => '1'));
     14        $this->hasColumn('is_friend', 'boolean', null, array('type' => 'boolean'));
     15        $this->hasColumn('is_friend_pre', 'boolean', null, array('type' => 'boolean'));
     16        $this->hasColumn('is_access_block', 'boolean', null, array('type' => 'boolean'));
    1717
    1818        $this->option('charset', 'utf8');
  • OpenPNE3/branches/goto_doctrine/lib/model/doctrine/base/BaseProfile.class.php

    r11219 r11307  
    1111        $this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'primary' => true, 'autoincrement' => true, 'length' => '4'));
    1212        $this->hasColumn('name', 'string', 64, array('type' => 'string', 'default' => '', 'notnull' => true, 'length' => '64'));
    13         $this->hasColumn('is_required', 'integer', 1, array('type' => 'integer', 'default' => '0', 'notnull' => true, 'length' => '1'));
    14         $this->hasColumn('is_unique', 'integer', 1, array('type' => 'integer', 'default' => '0', 'notnull' => true, 'length' => '1'));
    15         $this->hasColumn('is_edit_public_flag', 'integer', 1, array('type' => 'integer', 'default' => '0', 'notnull' => true, 'length' => '1'));
     13        $this->hasColumn('is_required', 'boolean', null, array('type' => 'boolean', 'default' => false, 'notnull' => true));
     14        $this->hasColumn('is_unique', 'boolean', null, array('type' => 'boolean', 'default' => false, 'notnull' => true));
     15        $this->hasColumn('is_edit_public_flag', 'boolean', null, array('type' => 'boolean', 'default' => false, 'notnull' => true));
    1616        $this->hasColumn('default_public_flag', 'integer', 1, array('type' => 'integer', 'default' => '1', 'notnull' => true, 'length' => '1'));
    1717        $this->hasColumn('form_type', 'string', 32, array('type' => 'string', 'default' => '', 'notnull' => true, 'length' => '32'));
    1818        $this->hasColumn('value_type', 'string', 32, array('type' => 'string', 'default' => '', 'notnull' => true, 'length' => '32'));
    19         $this->hasColumn('is_disp_regist', 'integer', 1, array('type' => 'integer', 'default' => '0', 'notnull' => true, 'length' => '1'));
    20         $this->hasColumn('is_disp_config', 'integer', 1, array('type' => 'integer', 'default' => '0', 'notnull' => true, 'length' => '1'));
    21         $this->hasColumn('is_disp_search', 'integer', 1, array('type' => 'integer', 'default' => '0', 'notnull' => true, 'length' => '1'));
     19        $this->hasColumn('is_disp_regist', 'boolean', null, array('type' => 'boolean', 'default' => false, 'notnull' => true));
     20        $this->hasColumn('is_disp_config', 'boolean', null, array('type' => 'boolean', 'default' => false, 'notnull' => true));
     21        $this->hasColumn('is_disp_search', 'boolean', null, array('type' => 'boolean', 'default' => false, 'notnull' => true));
    2222        $this->hasColumn('value_regexp', 'string', 2147483647, array('type' => 'string', 'length' => '2147483647'));
    2323        $this->hasColumn('value_min', 'string', 32, array('type' => 'string', 'length' => '32'));
Note: See TracChangeset for help on using the changeset viewer.