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
6401e760
Commit
6401e760
authored
Sep 02, 2013
by
dazz
Committed by
Benjamin Eberlei
Nov 13, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DBAL-407] Implement and detect bad field name exception for sqlite
parent
68f1045d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
1 deletion
+21
-1
DBALException.php
lib/Doctrine/DBAL/DBALException.php
+1
-0
Driver.php
lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php
+4
-0
ExceptionTest.php
tests/Doctrine/Tests/DBAL/Functional/ExceptionTest.php
+16
-1
No files found.
lib/Doctrine/DBAL/DBALException.php
View file @
6401e760
...
@@ -26,6 +26,7 @@ class DBALException extends \Exception
...
@@ -26,6 +26,7 @@ class DBALException extends \Exception
const
ERROR_TABLE_ALREADY_EXISTS
=
3
;
const
ERROR_TABLE_ALREADY_EXISTS
=
3
;
const
ERROR_FOREIGN_KEY_CONSTRAINT
=
4
;
const
ERROR_FOREIGN_KEY_CONSTRAINT
=
4
;
const
ERROR_NOT_NULL
=
5
;
const
ERROR_NOT_NULL
=
5
;
const
ERROR_BAD_FIELD_NAME
=
6
;
/**
/**
* @param string $method
* @param string $method
...
...
lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php
View file @
6401e760
...
@@ -135,6 +135,10 @@ class Driver implements \Doctrine\DBAL\Driver
...
@@ -135,6 +135,10 @@ class Driver implements \Doctrine\DBAL\Driver
if
(
strpos
(
$exception
->
getMessage
(),
'already exists'
)
!==
false
)
{
if
(
strpos
(
$exception
->
getMessage
(),
'already exists'
)
!==
false
)
{
return
DBALException
::
ERROR_TABLE_ALREADY_EXISTS
;
return
DBALException
::
ERROR_TABLE_ALREADY_EXISTS
;
}
}
if
(
strpos
(
$exception
->
getMessage
(),
'has no column named'
)
!==
false
)
{
return
DBALException
::
ERROR_BAD_FIELD_NAME
;
}
}
}
return
0
;
return
0
;
...
...
tests/Doctrine/Tests/DBAL/Functional/ExceptionTest.php
View file @
6401e760
...
@@ -29,7 +29,7 @@ class ExceptionTest extends \Doctrine\Tests\DbalFunctionalTestCase
...
@@ -29,7 +29,7 @@ class ExceptionTest extends \Doctrine\Tests\DbalFunctionalTestCase
$this
->
_conn
->
executeQuery
(
$sql
);
$this
->
_conn
->
executeQuery
(
$sql
);
}
}
public
function
testTableAlreadyExists
()
public
function
testTableAlreadyExists
Exception
()
{
{
$table
=
new
\Doctrine\DBAL\Schema\Table
(
"alreadyexist_table"
);
$table
=
new
\Doctrine\DBAL\Schema\Table
(
"alreadyexist_table"
);
$table
->
addColumn
(
'id'
,
'integer'
,
array
());
$table
->
addColumn
(
'id'
,
'integer'
,
array
());
...
@@ -90,6 +90,21 @@ class ExceptionTest extends \Doctrine\Tests\DbalFunctionalTestCase
...
@@ -90,6 +90,21 @@ class ExceptionTest extends \Doctrine\Tests\DbalFunctionalTestCase
$this
->
_conn
->
insert
(
"notnull_table"
,
array
(
'id'
=>
1
));
$this
->
_conn
->
insert
(
"notnull_table"
,
array
(
'id'
=>
1
));
}
}
public
function
testBadFieldNameException
()
{
$schema
=
new
\Doctrine\DBAL\Schema\Schema
();
$table
=
$schema
->
createTable
(
"non_unique_table"
);
$table
->
addColumn
(
'id'
,
'integer'
,
array
(
'unique'
=>
true
));
foreach
(
$schema
->
toSql
(
$this
->
_conn
->
getDatabasePlatform
())
AS
$sql
)
{
$this
->
_conn
->
executeQuery
(
$sql
);
}
$this
->
setExpectedException
(
'\Doctrine\DBAL\DBALException'
,
null
,
DBALException
::
ERROR_BAD_FIELD_NAME
);
$this
->
_conn
->
insert
(
"non_unique_table"
,
array
(
'name'
=>
5
));
}
protected
function
onNotSuccessfulTest
(
\Exception
$e
)
protected
function
onNotSuccessfulTest
(
\Exception
$e
)
{
{
parent
::
onNotSuccessfulTest
(
$e
);
parent
::
onNotSuccessfulTest
(
$e
);
...
...
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