Skip to content

Commit 09b3927

Browse files
committed
Add nullable=false to proper fields, make parentObjectIdentity a relationship
1 parent 6e05b14 commit 09b3927

File tree

4 files changed

+30
-7
lines changed

4 files changed

+30
-7
lines changed

Resources/config/doctrine/AclClass.orm.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ Curiosity26\AclHelperBundle\Entity\AclClass:
1111
name: class_type
1212
type: string
1313
length: 200
14-
unique: true
14+
unique: true
15+
nullable: false

Resources/config/doctrine/Entry.orm.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,27 @@ Curiosity26\AclHelperBundle\Entity\Entry:
3535
class:
3636
targetEntity: 'Curiosity26\AclHelperBundle\Entity\AclClass'
3737
cascade: ["persist"]
38+
joinColumns:
39+
class_id:
40+
nullable: false
41+
options:
42+
unsigned: true
43+
nullable: false
3844
objectIdentity:
3945
targetEntity: 'Curiosity26\AclHelperBundle\Entity\ObjectIdentity'
4046
casade: ['persist']
47+
joinColumns:
48+
object_identity_id:
49+
options:
50+
unsigned: true
4151
securityIdentity:
4252
targetEntity: 'Curiosity26\AclHelperBundle\Entity\SecurityIdentity'
4353
cascade: ["persist"]
54+
joinColumns:
55+
security_identity_id:
56+
nullable: false
57+
options:
58+
unsigned: true
4459
uniqueConstraints:
4560
entry_idx:
4661
columns: [class_id, object_identity_id, field_name, ace_order]

Resources/config/doctrine/ObjectIdentity.orm.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,27 @@ Curiosity26\AclHelperBundle\Entity\ObjectIdentity:
77
type: integer
88
generator: { strategy: AUTO }
99
fields:
10-
parentObjectIdentity:
11-
column: parent_object_identity_id
12-
type: integer
13-
nullable: true
14-
options:
15-
unsigned: true
1610
objectIdentifier:
1711
type: string
1812
length: 100
13+
nullable: false
1914
entriesInheriting:
2015
type: boolean
2116
manyToOne:
2217
class:
2318
targetEntity: 'Curiosity26\AclHelperBundle\Entity\AclClass'
2419
cascade: ["persist"]
20+
joinColumns:
21+
class_id:
22+
nullable: false
23+
options:
24+
unsigned: true
25+
parentObjectIdentity:
26+
targetEntity: 'Curiosity26\AclHelperBundle\Entity\ObjectIdentity'
27+
joinColumns:
28+
parent_object_identity_id:
29+
options:
30+
unsigned: true
2531
manyToMany:
2632
ancestor:
2733
targetEntity: 'Curiosity26\AclHelperBundle\Entity\ObjectIdentity'

Resources/config/doctrine/SecurityIdentity.orm.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Curiosity26\AclHelperBundle\Entity\SecurityIdentity:
1010
identifier:
1111
type: string
1212
length: 200
13+
nullable: false
1314
username:
1415
type: boolean
1516
uniqueConstraints:

0 commit comments

Comments
 (0)