Skip to content

Commit 4e07b1f

Browse files
barryobarryo
committed
[BF] Fix #139 
1 parent c24c04a commit 4e07b1f

14 files changed

+184
-89
lines changed

‎doctrine2/ViMbAdmin.ormdesigner‎

Lines changed: 31 additions & 48 deletions
Large diffs are not rendered by default.

‎doctrine2/xml/Entities.Admin.dcm.xml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
<?xml version="1.0"?>
22
<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">
3-
<entity name="Entities\Admin" repository-class="Repositories\Admin" table="admin" schema="vimbadmin">
3+
<entity name="Entities\Admin" repository-class="Repositories\Admin" table="admin">
44
<id name="id" type="bigint">
55
<generator strategy="AUTO"/>
66
</id>
77
<field name="username" type="string" length="255" nullable="true"/>
88
<field name="password" type="string" length="255" nullable="false"/>
9-
<field name="super" type="boolean" nullable="false"/>
10-
<field name="active" type="boolean" nullable="false"/>
9+
<field name="super" type="boolean" nullable="false">
10+
<options>
11+
<option name="default">0</option>
12+
</options>
13+
</field>
14+
<field name="active" type="boolean" nullable="false">
15+
<options>
16+
<option name="default">1</option>
17+
</options>
18+
</field>
1119
<field name="created" type="datetime" nullable="false"/>
1220
<field name="modified" type="datetime" nullable="true"/>
1321
<unique-constraints>

‎doctrine2/xml/Entities.AdminPreference.dcm.xml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
11
<?xml version="1.0"?>
22
<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">
3-
<entity name="Entities\AdminPreference" repository-class="Repositories\AdminPreference" schema="vimbadmin" table="admin_pref">
3+
<entity name="Entities\AdminPreference" repository-class="Repositories\AdminPreference" table="admin_pref">
44
<id name="id" type="bigint">
55
<generator strategy="AUTO"/>
66
</id>
77
<field name="attribute" type="string" length="255" nullable="false"/>
8-
<field name="ix" type="integer" nullable="false"/>
9-
<field name="op" type="string" length="2" nullable="false"/>
8+
<field name="ix" type="integer" nullable="false">
9+
<options>
10+
<option name="default">0</option>
11+
</options>
12+
</field>
13+
<field name="op" type="string" length="2" nullable="false">
14+
<options>
15+
<option name="default">:=</option>
16+
</options>
17+
</field>
1018
<field name="value" type="text" nullable="false"/>
11-
<field name="expire" type="bigint" nullable="false"/>
19+
<field name="expire" type="bigint" nullable="false">
20+
<options>
21+
<option name="default">0</option>
22+
</options>
23+
</field>
1224
<unique-constraints>
1325
<unique-constraint name="IX_AdminPreference_1" columns="Admin_id,attribute,ix"/>
1426
</unique-constraints>

‎doctrine2/xml/Entities.Alias.dcm.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<?xml version="1.0"?>
22
<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">
3-
<entity name="Entities\Alias" repository-class="Repositories\Alias" schema="vimbadmin" table="alias">
3+
<entity name="Entities\Alias" repository-class="Repositories\Alias" table="alias">
44
<id name="id" type="bigint">
55
<generator strategy="AUTO"/>
66
</id>
77
<field name="address" type="string" unique="true" length="255" nullable="false"/>
88
<field name="goto" type="text" nullable="false"/>
9-
<field name="active" type="boolean" nullable="false"/>
9+
<field name="active" type="boolean" nullable="false">
10+
<options>
11+
<option name="default">1</option>
12+
</options>
13+
</field>
1014
<field name="created" type="datetime" nullable="false"/>
1115
<field name="modified" type="datetime" nullable="true"/>
1216
<many-to-one field="Domain" target-entity="Entities\Domain" inversed-by="Aliases">

‎doctrine2/xml/Entities.AliasPreference.dcm.xml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
11
<?xml version="1.0"?>
22
<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">
3-
<entity name="Entities\AliasPreference" repository-class="Repositories\AliasPreference" schema="vimbadmin" table="alias_pref">
3+
<entity name="Entities\AliasPreference" repository-class="Repositories\AliasPreference" table="alias_pref">
44
<id name="id" type="bigint">
55
<generator strategy="AUTO"/>
66
</id>
77
<field name="attribute" type="string" length="255" nullable="false"/>
8-
<field name="ix" type="integer" nullable="false"/>
9-
<field name="op" type="string" length="2" nullable="false"/>
8+
<field name="ix" type="integer" nullable="false">
9+
<options>
10+
<option name="default">0</option>
11+
</options>
12+
</field>
13+
<field name="op" type="string" length="2" nullable="false">
14+
<options>
15+
<option name="default">:=</option>
16+
</options>
17+
</field>
1018
<field name="value" type="text" nullable="false"/>
11-
<field name="expire" type="bigint" nullable="false"/>
19+
<field name="expire" type="bigint" nullable="false">
20+
<options>
21+
<option name="default">0</option>
22+
</options>
23+
</field>
1224
<indexes>
1325
<index name="IX_AliasPreference_1" columns="Alias_id,attribute,ix"/>
1426
</indexes>

‎doctrine2/xml/Entities.Archive.dcm.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<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">
3-
<entity name="Entities\Archive" repository-class="Repositories\Archive" schema="vimbadmin" table="archive">
3+
<entity name="Entities\Archive" repository-class="Repositories\Archive" table="archive">
44
<id name="id" type="bigint">
55
<generator strategy="AUTO"/>
66
</id>

‎doctrine2/xml/Entities.DatabaseVersion.dcm.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<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">
3-
<entity name="Entities\DatabaseVersion" repository-class="Repositories\DatabaseVersion" schema="vimbadmin" table="dbversion">
3+
<entity name="Entities\DatabaseVersion" repository-class="Repositories\DatabaseVersion" table="dbversion">
44
<id name="id" type="integer">
55
<generator strategy="AUTO"/>
66
</id>

‎doctrine2/xml/Entities.DirectoryEntry.dcm.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<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">
3-
<entity name="Entities\DirectoryEntry" repository-class="Repositories\DirectoryEntry" schema="vimbadmin" table="directory_entry">
3+
<entity name="Entities\DirectoryEntry" repository-class="Repositories\DirectoryEntry" table="directory_entry">
44
<id name="id" type="bigint">
55
<generator strategy="AUTO"/>
66
</id>

‎doctrine2/xml/Entities.Domain.dcm.xml‎

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,56 @@
11
<?xml version="1.0"?>
22
<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">
3-
<entity name="Entities\Domain" repository-class="Repositories\Domain" schema="vimbadmin" table="domain">
3+
<entity name="Entities\Domain" repository-class="Repositories\Domain" table="domain">
44
<id name="id" type="bigint">
55
<generator strategy="AUTO"/>
66
</id>
77
<field name="domain" type="string" length="255" nullable="false"/>
88
<field name="description" type="string" length="255" nullable="true"/>
9-
<field name="max_aliases" type="integer" length="0" nullable="false"/>
10-
<field name="alias_count" type="bigint" nullable="false"/>
11-
<field name="max_mailboxes" type="integer" length="0" nullable="false"/>
12-
<field name="mailbox_count" type="bigint" nullable="false"/>
13-
<field name="max_quota" type="bigint" nullable="false"/>
14-
<field name="quota" type="bigint" nullable="false"/>
15-
<field name="transport" type="string" length="255" nullable="false"/>
16-
<field name="backupmx" type="boolean" nullable="false"/>
17-
<field name="active" type="boolean" nullable="false"/>
9+
<field name="max_aliases" type="integer" length="0" nullable="false">
10+
<options>
11+
<option name="default">0</option>
12+
</options>
13+
</field>
14+
<field name="alias_count" type="bigint" nullable="false">
15+
<options>
16+
<option name="default">0</option>
17+
</options>
18+
</field>
19+
<field name="max_mailboxes" type="integer" length="0" nullable="false">
20+
<options>
21+
<option name="default">0</option>
22+
</options>
23+
</field>
24+
<field name="mailbox_count" type="bigint" nullable="false">
25+
<options>
26+
<option name="default">0</option>
27+
</options>
28+
</field>
29+
<field name="max_quota" type="bigint" nullable="false">
30+
<options>
31+
<option name="default">0</option>
32+
</options>
33+
</field>
34+
<field name="quota" type="bigint" nullable="false">
35+
<options>
36+
<option name="default">0</option>
37+
</options>
38+
</field>
39+
<field name="transport" type="string" length="255" nullable="false">
40+
<options>
41+
<option name="default">virtual</option>
42+
</options>
43+
</field>
44+
<field name="backupmx" type="boolean" nullable="false">
45+
<options>
46+
<option name="default">0</option>
47+
</options>
48+
</field>
49+
<field name="active" type="boolean" nullable="false">
50+
<options>
51+
<option name="default">1</option>
52+
</options>
53+
</field>
1854
<field name="homedir" type="string" length="255" nullable="true"/>
1955
<field name="maildir" type="string" length="255" nullable="true"/>
2056
<field name="uid" type="integer" nullable="true"/>

‎doctrine2/xml/Entities.DomainPreference.dcm.xml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
11
<?xml version="1.0"?>
22
<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">
3-
<entity name="Entities\DomainPreference" repository-class="Repositories\DomainPreference" schema="vimbadmin" table="domain_pref">
3+
<entity name="Entities\DomainPreference" repository-class="Repositories\DomainPreference" table="domain_pref">
44
<id name="id" type="bigint">
55
<generator strategy="AUTO"/>
66
</id>
77
<field name="attribute" type="string" length="255" nullable="false"/>
8-
<field name="ix" type="integer" nullable="false"/>
9-
<field name="op" type="string" length="2" nullable="false"/>
8+
<field name="ix" type="integer" nullable="false">
9+
<options>
10+
<option name="default">0</option>
11+
</options>
12+
</field>
13+
<field name="op" type="string" length="2" nullable="false">
14+
<options>
15+
<option name="default">:=</option>
16+
</options>
17+
</field>
1018
<field name="value" type="text" nullable="false"/>
11-
<field name="expire" type="bigint" nullable="false"/>
19+
<field name="expire" type="bigint" nullable="false">
20+
<options>
21+
<option name="default">0</option>
22+
</options>
23+
</field>
1224
<indexes>
1325
<index name="IX_DomainPreference_1" columns="Domain_id,attribute,ix"/>
1426
</indexes>

0 commit comments

Comments
 (0)