Skip to content

Commit

Permalink
[BF] Fix #139
Browse files Browse the repository at this point in the history
  • Loading branch information
barryo committed May 31, 2015
1 parent c24c04a commit 4e07b1f
Show file tree
Hide file tree
Showing 14 changed files with 184 additions and 89 deletions.
79 changes: 31 additions & 48 deletions doctrine2/ViMbAdmin.ormdesigner

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions doctrine2/xml/Entities.Admin.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\Admin" repository-class="Repositories\Admin" table="admin" schema="vimbadmin">
<entity name="Entities\Admin" repository-class="Repositories\Admin" table="admin">
<id name="id" type="bigint">
<generator strategy="AUTO"/>
</id>
<field name="username" type="string" length="255" nullable="true"/>
<field name="password" type="string" length="255" nullable="false"/>
<field name="super" type="boolean" nullable="false"/>
<field name="active" type="boolean" nullable="false"/>
<field name="super" type="boolean" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="active" type="boolean" nullable="false">
<options>
<option name="default">1</option>
</options>
</field>
<field name="created" type="datetime" nullable="false"/>
<field name="modified" type="datetime" nullable="true"/>
<unique-constraints>
Expand Down
20 changes: 16 additions & 4 deletions doctrine2/xml/Entities.AdminPreference.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\AdminPreference" repository-class="Repositories\AdminPreference" schema="vimbadmin" table="admin_pref">
<entity name="Entities\AdminPreference" repository-class="Repositories\AdminPreference" table="admin_pref">
<id name="id" type="bigint">
<generator strategy="AUTO"/>
</id>
<field name="attribute" type="string" length="255" nullable="false"/>
<field name="ix" type="integer" nullable="false"/>
<field name="op" type="string" length="2" nullable="false"/>
<field name="ix" type="integer" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="op" type="string" length="2" nullable="false">
<options>
<option name="default">:=</option>
</options>
</field>
<field name="value" type="text" nullable="false"/>
<field name="expire" type="bigint" nullable="false"/>
<field name="expire" type="bigint" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<unique-constraints>
<unique-constraint name="IX_AdminPreference_1" columns="Admin_id,attribute,ix"/>
</unique-constraints>
Expand Down
8 changes: 6 additions & 2 deletions doctrine2/xml/Entities.Alias.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\Alias" repository-class="Repositories\Alias" schema="vimbadmin" table="alias">
<entity name="Entities\Alias" repository-class="Repositories\Alias" table="alias">
<id name="id" type="bigint">
<generator strategy="AUTO"/>
</id>
<field name="address" type="string" unique="true" length="255" nullable="false"/>
<field name="goto" type="text" nullable="false"/>
<field name="active" type="boolean" nullable="false"/>
<field name="active" type="boolean" nullable="false">
<options>
<option name="default">1</option>
</options>
</field>
<field name="created" type="datetime" nullable="false"/>
<field name="modified" type="datetime" nullable="true"/>
<many-to-one field="Domain" target-entity="Entities\Domain" inversed-by="Aliases">
Expand Down
20 changes: 16 additions & 4 deletions doctrine2/xml/Entities.AliasPreference.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\AliasPreference" repository-class="Repositories\AliasPreference" schema="vimbadmin" table="alias_pref">
<entity name="Entities\AliasPreference" repository-class="Repositories\AliasPreference" table="alias_pref">
<id name="id" type="bigint">
<generator strategy="AUTO"/>
</id>
<field name="attribute" type="string" length="255" nullable="false"/>
<field name="ix" type="integer" nullable="false"/>
<field name="op" type="string" length="2" nullable="false"/>
<field name="ix" type="integer" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="op" type="string" length="2" nullable="false">
<options>
<option name="default">:=</option>
</options>
</field>
<field name="value" type="text" nullable="false"/>
<field name="expire" type="bigint" nullable="false"/>
<field name="expire" type="bigint" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<indexes>
<index name="IX_AliasPreference_1" columns="Alias_id,attribute,ix"/>
</indexes>
Expand Down
2 changes: 1 addition & 1 deletion doctrine2/xml/Entities.Archive.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\Archive" repository-class="Repositories\Archive" schema="vimbadmin" table="archive">
<entity name="Entities\Archive" repository-class="Repositories\Archive" table="archive">
<id name="id" type="bigint">
<generator strategy="AUTO"/>
</id>
Expand Down
2 changes: 1 addition & 1 deletion doctrine2/xml/Entities.DatabaseVersion.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\DatabaseVersion" repository-class="Repositories\DatabaseVersion" schema="vimbadmin" table="dbversion">
<entity name="Entities\DatabaseVersion" repository-class="Repositories\DatabaseVersion" table="dbversion">
<id name="id" type="integer">
<generator strategy="AUTO"/>
</id>
Expand Down
2 changes: 1 addition & 1 deletion doctrine2/xml/Entities.DirectoryEntry.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\DirectoryEntry" repository-class="Repositories\DirectoryEntry" schema="vimbadmin" table="directory_entry">
<entity name="Entities\DirectoryEntry" repository-class="Repositories\DirectoryEntry" table="directory_entry">
<id name="id" type="bigint">
<generator strategy="AUTO"/>
</id>
Expand Down
56 changes: 46 additions & 10 deletions doctrine2/xml/Entities.Domain.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,56 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\Domain" repository-class="Repositories\Domain" schema="vimbadmin" table="domain">
<entity name="Entities\Domain" repository-class="Repositories\Domain" table="domain">
<id name="id" type="bigint">
<generator strategy="AUTO"/>
</id>
<field name="domain" type="string" length="255" nullable="false"/>
<field name="description" type="string" length="255" nullable="true"/>
<field name="max_aliases" type="integer" length="0" nullable="false"/>
<field name="alias_count" type="bigint" nullable="false"/>
<field name="max_mailboxes" type="integer" length="0" nullable="false"/>
<field name="mailbox_count" type="bigint" nullable="false"/>
<field name="max_quota" type="bigint" nullable="false"/>
<field name="quota" type="bigint" nullable="false"/>
<field name="transport" type="string" length="255" nullable="false"/>
<field name="backupmx" type="boolean" nullable="false"/>
<field name="active" type="boolean" nullable="false"/>
<field name="max_aliases" type="integer" length="0" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="alias_count" type="bigint" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="max_mailboxes" type="integer" length="0" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="mailbox_count" type="bigint" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="max_quota" type="bigint" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="quota" type="bigint" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="transport" type="string" length="255" nullable="false">
<options>
<option name="default">virtual</option>
</options>
</field>
<field name="backupmx" type="boolean" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="active" type="boolean" nullable="false">
<options>
<option name="default">1</option>
</options>
</field>
<field name="homedir" type="string" length="255" nullable="true"/>
<field name="maildir" type="string" length="255" nullable="true"/>
<field name="uid" type="integer" nullable="true"/>
Expand Down
20 changes: 16 additions & 4 deletions doctrine2/xml/Entities.DomainPreference.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\DomainPreference" repository-class="Repositories\DomainPreference" schema="vimbadmin" table="domain_pref">
<entity name="Entities\DomainPreference" repository-class="Repositories\DomainPreference" table="domain_pref">
<id name="id" type="bigint">
<generator strategy="AUTO"/>
</id>
<field name="attribute" type="string" length="255" nullable="false"/>
<field name="ix" type="integer" nullable="false"/>
<field name="op" type="string" length="2" nullable="false"/>
<field name="ix" type="integer" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="op" type="string" length="2" nullable="false">
<options>
<option name="default">:=</option>
</options>
</field>
<field name="value" type="text" nullable="false"/>
<field name="expire" type="bigint" nullable="false"/>
<field name="expire" type="bigint" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<indexes>
<index name="IX_DomainPreference_1" columns="Domain_id,attribute,ix"/>
</indexes>
Expand Down
2 changes: 1 addition & 1 deletion doctrine2/xml/Entities.Log.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\Log" repository-class="Repositories\Log" schema="vimbadmin" table="log">
<entity name="Entities\Log" repository-class="Repositories\Log" table="log">
<id name="id" type="bigint">
<generator strategy="AUTO"/>
</id>
Expand Down
26 changes: 21 additions & 5 deletions doctrine2/xml/Entities.Mailbox.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,41 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\Mailbox" repository-class="Repositories\Mailbox" schema="vimbadmin" table="mailbox">
<entity name="Entities\Mailbox" repository-class="Repositories\Mailbox" table="mailbox">
<id name="id" type="bigint">
<generator strategy="AUTO"/>
</id>
<field name="username" type="string" length="255" nullable="false"/>
<field name="password" type="string" nullable="false"/>
<field name="name" type="string" length="255" nullable="true"/>
<field name="alt_email" type="string" length="255" nullable="true"/>
<field name="quota" type="bigint" nullable="false"/>
<field name="quota" type="bigint" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="local_part" type="string" length="255" nullable="false"/>
<field name="active" type="boolean" nullable="false"/>
<field name="access_restriction" type="string" length="100" nullable="false"/>
<field name="active" type="boolean" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="access_restriction" type="string" length="100" nullable="false">
<options>
<option name="default">ALL</option>
</options>
</field>
<field name="homedir" type="string" length="255" nullable="true"/>
<field name="maildir" type="string" length="255" nullable="true"/>
<field name="uid" type="bigint" nullable="true"/>
<field name="gid" type="bigint" nullable="true"/>
<field name="homedir_size" type="bigint" nullable="true"/>
<field name="maildir_size" type="bigint" nullable="true"/>
<field name="size_at" type="datetime" nullable="true"/>
<field name="delete_pending" type="boolean" nullable="true"/>
<field name="delete_pending" type="boolean" nullable="true">
<options>
<option name="default">0</option>
</options>
</field>
<field name="created" type="datetime" nullable="false"/>
<field name="modified" type="datetime" nullable="true"/>
<many-to-one field="Domain" target-entity="Entities\Domain" inversed-by="Mailboxes">
Expand Down
20 changes: 16 additions & 4 deletions doctrine2/xml/Entities.MailboxPreference.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\MailboxPreference" repository-class="Repositories\MailboxPreference" schema="vimbadmin" table="mailbox_pref">
<entity name="Entities\MailboxPreference" repository-class="Repositories\MailboxPreference" table="mailbox_pref">
<id name="id" type="bigint">
<generator strategy="AUTO"/>
</id>
<field name="attribute" type="string" length="255" nullable="false"/>
<field name="ix" type="integer" nullable="false"/>
<field name="op" type="string" length="2" nullable="false"/>
<field name="ix" type="integer" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<field name="op" type="string" length="2" nullable="false">
<options>
<option name="default">:=</option>
</options>
</field>
<field name="value" type="text" nullable="false"/>
<field name="expire" type="bigint" nullable="false"/>
<field name="expire" type="bigint" nullable="false">
<options>
<option name="default">0</option>
</options>
</field>
<indexes>
<index name="IX_MailboxPreference_1" columns="Mailbox_id,attribute,ix"/>
</indexes>
Expand Down
2 changes: 1 addition & 1 deletion doctrine2/xml/Entities.RememberMe.dcm.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="Entities\RememberMe" repository-class="Repositories\RememberMe" schema="vimbadmin" table="remember_me">
<entity name="Entities\RememberMe" repository-class="Repositories\RememberMe" table="remember_me">
<id name="id" type="bigint">
<generator strategy="AUTO"/>
</id>
Expand Down

0 comments on commit 4e07b1f

Please sign in to comment.