Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
674e9bee
Commit
674e9bee
authored
Jan 06, 2010
by
romanb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[2.0][DDC-242][DDC-243] Fixed.
parent
6e4e45e1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
doctrine-mapping.xsd
doctrine-mapping.xsd
+2
-0
XmlDriver.php
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
+1
-1
No files found.
doctrine-mapping.xsd
View file @
674e9bee
...
@@ -67,6 +67,7 @@
...
@@ -67,6 +67,7 @@
<xs:element
name=
"field"
type=
"orm:field"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
<xs:element
name=
"field"
type=
"orm:field"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
<xs:element
name=
"one-to-one"
type=
"orm:one-to-one"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
<xs:element
name=
"one-to-one"
type=
"orm:one-to-one"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
<xs:element
name=
"one-to-many"
type=
"orm:one-to-many"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
<xs:element
name=
"one-to-many"
type=
"orm:one-to-many"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
<xs:element
name=
"many-to-one"
type=
"orm:many-to-one"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
<xs:element
name=
"many-to-many"
type=
"orm:many-to-many"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
<xs:element
name=
"many-to-many"
type=
"orm:many-to-many"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
</xs:sequence>
</xs:sequence>
<xs:attribute
name=
"name"
type=
"xs:string"
use=
"required"
/>
<xs:attribute
name=
"name"
type=
"xs:string"
use=
"required"
/>
...
@@ -214,6 +215,7 @@
...
@@ -214,6 +215,7 @@
</xs:sequence>
</xs:sequence>
<xs:attribute
name=
"target-entity"
type=
"xs:NMTOKEN"
use=
"required"
/>
<xs:attribute
name=
"target-entity"
type=
"xs:NMTOKEN"
use=
"required"
/>
<xs:attribute
name=
"field"
type=
"xs:NMTOKEN"
use=
"required"
/>
<xs:attribute
name=
"field"
type=
"xs:NMTOKEN"
use=
"required"
/>
<xs:attribute
name=
"mapped-by"
type=
"xs:NMTOKEN"
/>
<xs:attribute
name=
"fetch"
type=
"orm:fetch-type"
default=
"LAZY"
/>
<xs:attribute
name=
"fetch"
type=
"orm:fetch-type"
default=
"LAZY"
/>
</xs:complexType>
</xs:complexType>
...
...
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
View file @
674e9bee
...
@@ -316,7 +316,7 @@ class XmlDriver extends AbstractFileDriver
...
@@ -316,7 +316,7 @@ class XmlDriver extends AbstractFileDriver
$mapping
[
'fetch'
]
=
constant
(
'Doctrine\ORM\Mapping\AssociationMapping::FETCH_'
.
(
string
)
$manyToManyElement
[
'fetch'
]);
$mapping
[
'fetch'
]
=
constant
(
'Doctrine\ORM\Mapping\AssociationMapping::FETCH_'
.
(
string
)
$manyToManyElement
[
'fetch'
]);
}
}
if
(
isset
(
$manyToManyElement
[
'mapped
B
y'
]))
{
if
(
isset
(
$manyToManyElement
[
'mapped
-b
y'
]))
{
$mapping
[
'mappedBy'
]
=
(
string
)
$manyToManyElement
[
'mapped-by'
];
$mapping
[
'mappedBy'
]
=
(
string
)
$manyToManyElement
[
'mapped-by'
];
}
else
if
(
isset
(
$manyToManyElement
->
{
'join-table'
}))
{
}
else
if
(
isset
(
$manyToManyElement
->
{
'join-table'
}))
{
$joinTableElement
=
$manyToManyElement
->
{
'join-table'
};
$joinTableElement
=
$manyToManyElement
->
{
'join-table'
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment