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
41d28002
Commit
41d28002
authored
Nov 14, 2011
by
Benjamin Eberlei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DBAL-144 - Dont throw exception when no primary key exists
parent
970c8ab6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
15 deletions
+18
-15
Table.php
lib/Doctrine/DBAL/Schema/Table.php
+13
-10
Graphviz.php
lib/Doctrine/DBAL/Schema/Visitor/Graphviz.php
+5
-5
No files found.
lib/Doctrine/DBAL/Schema/Table.php
View file @
41d28002
...
@@ -475,7 +475,7 @@ class Table extends AbstractAsset
...
@@ -475,7 +475,7 @@ class Table extends AbstractAsset
$pkCols
=
array
();
$pkCols
=
array
();
$fkCols
=
array
();
$fkCols
=
array
();
if
(
$this
->
has
Index
(
$this
->
_primaryKeyName
))
{
if
(
$this
->
has
PrimaryKey
(
))
{
$pkCols
=
$this
->
getPrimaryKey
()
->
getColumns
();
$pkCols
=
$this
->
getPrimaryKey
()
->
getColumns
();
}
}
foreach
(
$this
->
getForeignKeys
()
AS
$fk
)
{
foreach
(
$this
->
getForeignKeys
()
AS
$fk
)
{
...
@@ -520,10 +520,13 @@ class Table extends AbstractAsset
...
@@ -520,10 +520,13 @@ class Table extends AbstractAsset
}
}
/**
/**
* @return Index
* @return Index
|null
*/
*/
public
function
getPrimaryKey
()
public
function
getPrimaryKey
()
{
{
if
(
!
$this
->
hasPrimaryKey
())
{
return
null
;
}
return
$this
->
getIndex
(
$this
->
_primaryKeyName
);
return
$this
->
getIndex
(
$this
->
_primaryKeyName
);
}
}
...
...
lib/Doctrine/DBAL/Schema/Visitor/Graphviz.php
View file @
41d28002
...
@@ -99,7 +99,7 @@ class Graphviz implements \Doctrine\DBAL\Schema\Visitor\Visitor
...
@@ -99,7 +99,7 @@ class Graphviz implements \Doctrine\DBAL\Schema\Visitor\Visitor
$label
.=
'<FONT COLOR="#2e3436" FACE="Helvetica" POINT-SIZE="12">'
.
$columnLabel
.
'</FONT>'
;
$label
.=
'<FONT COLOR="#2e3436" FACE="Helvetica" POINT-SIZE="12">'
.
$columnLabel
.
'</FONT>'
;
$label
.=
'</TD><TD BORDER="0" ALIGN="LEFT" BGCOLOR="#eeeeec"><FONT COLOR="#2e3436" FACE="Helvetica" POINT-SIZE="10">'
.
strtolower
(
$column
->
getType
())
.
'</FONT></TD>'
;
$label
.=
'</TD><TD BORDER="0" ALIGN="LEFT" BGCOLOR="#eeeeec"><FONT COLOR="#2e3436" FACE="Helvetica" POINT-SIZE="10">'
.
strtolower
(
$column
->
getType
())
.
'</FONT></TD>'
;
$label
.=
'<TD BORDER="0" ALIGN="RIGHT" BGCOLOR="#eeeeec" PORT="col'
.
$column
->
getName
()
.
'">'
;
$label
.=
'<TD BORDER="0" ALIGN="RIGHT" BGCOLOR="#eeeeec" PORT="col'
.
$column
->
getName
()
.
'">'
;
if
(
in_array
(
$column
->
getName
(),
$table
->
getPrimaryKey
()
->
getColumns
()))
{
if
(
$table
->
hasPrimaryKey
()
&&
in_array
(
$column
->
getName
(),
$table
->
getPrimaryKey
()
->
getColumns
()))
{
$label
.=
"
\xe2\x9c\xb7
"
;
$label
.=
"
\xe2\x9c\xb7
"
;
}
}
$label
.=
'</TD></TR>'
;
$label
.=
'</TD></TR>'
;
...
...
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