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
e42bb0e5
Commit
e42bb0e5
authored
Jun 05, 2007
by
zYne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
--no commit message
--no commit message
parent
84eaea70
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
Export.php
lib/Doctrine/Export.php
+1
-1
Table.php
lib/Doctrine/Table.php
+3
-1
No files found.
lib/Doctrine/Export.php
View file @
e42bb0e5
...
@@ -822,7 +822,7 @@ class Doctrine_Export extends Doctrine_Connection_Module
...
@@ -822,7 +822,7 @@ class Doctrine_Export extends Doctrine_Connection_Module
try
{
try
{
$data
=
$table
->
getExportableFormat
();
$data
=
$table
->
getExportableFormat
();
$this
->
conn
->
export
->
createTable
(
$data
[
0
],
$data
[
1
],
$data
[
2
]);
$this
->
conn
->
export
->
createTable
(
$data
[
'tableName'
],
$data
[
'columns'
],
$data
[
'options'
]);
}
catch
(
Doctrine_Connection_Exception
$e
)
{
}
catch
(
Doctrine_Connection_Exception
$e
)
{
// we only want to silence table already exists errors
// we only want to silence table already exists errors
if
(
$e
->
getPortableCode
()
!==
Doctrine
::
ERR_ALREADY_EXISTS
)
{
if
(
$e
->
getPortableCode
()
!==
Doctrine
::
ERR_ALREADY_EXISTS
)
{
...
...
lib/Doctrine/Table.php
View file @
e42bb0e5
...
@@ -366,7 +366,9 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
...
@@ -366,7 +366,9 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
$options
[
'primary'
]
=
$primary
;
$options
[
'primary'
]
=
$primary
;
return
array
(
$this
->
getOption
(
'tableName'
),
$columns
,
array_merge
(
$this
->
getOptions
(),
$options
));
return
array
(
'tableName'
=>
$this
->
getOption
(
'tableName'
),
'columns'
=>
$columns
,
'options'
=>
array_merge
(
$this
->
getOptions
(),
$options
));
}
}
/**
/**
* exportConstraints
* exportConstraints
...
...
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