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
32b1a4f8
Commit
32b1a4f8
authored
Apr 30, 2015
by
Steve Müller
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #841 from BenMorel/docfix
Documentation & code styling fixes
parents
41e718ea
91f1b30a
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
27 additions
and
8 deletions
+27
-8
Connection.php
lib/Doctrine/DBAL/Connection.php
+2
-2
Connection.php
lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php
+1
-1
DriverManager.php
lib/Doctrine/DBAL/DriverManager.php
+3
-2
TableGenerator.php
lib/Doctrine/DBAL/Id/TableGenerator.php
+1
-1
DB2Platform.php
lib/Doctrine/DBAL/Platforms/DB2Platform.php
+0
-1
MySqlPlatform.php
lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
+9
-0
PostgreSqlPlatform.php
lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
+1
-1
QueryBuilder.php
lib/Doctrine/DBAL/Query/QueryBuilder.php
+2
-0
Schema.php
lib/Doctrine/DBAL/Schema/Schema.php
+2
-0
SqliteSchemaManager.php
lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php
+6
-0
No files found.
lib/Doctrine/DBAL/Connection.php
View file @
32b1a4f8
...
...
@@ -1104,7 +1104,7 @@ class Connection implements DriverConnection
$func
(
$this
);
$this
->
commit
();
}
catch
(
Exception
$e
)
{
$this
->
roll
b
ack
();
$this
->
roll
B
ack
();
throw
$e
;
}
}
...
...
@@ -1268,7 +1268,7 @@ class Connection implements DriverConnection
$logger
->
startQuery
(
'"ROLLBACK"'
);
}
$this
->
_transactionNestingLevel
=
0
;
$this
->
_conn
->
roll
b
ack
();
$this
->
_conn
->
roll
B
ack
();
$this
->
_isRollbackOnly
=
false
;
if
(
$logger
)
{
$logger
->
stopQuery
();
...
...
lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php
View file @
32b1a4f8
...
...
@@ -29,7 +29,7 @@ use Doctrine\DBAL\Driver\PDOConnection;
class
Connection
extends
PDOConnection
implements
\Doctrine\DBAL\Driver\Connection
{
/**
*
@override
*
{@inheritDoc}
*/
public
function
quote
(
$value
,
$type
=
\PDO
::
PARAM_STR
)
{
...
...
lib/Doctrine/DBAL/DriverManager.php
View file @
32b1a4f8
...
...
@@ -218,9 +218,10 @@ final class DriverManager
*
* @param array $params The list of parameters.
*
* @
param
array A modified list of parameters with info from a database
* @
return
array A modified list of parameters with info from a database
* URL extracted into indidivual parameter parts.
*
* @throws DBALException
*/
private
static
function
parseDatabaseUrl
(
array
$params
)
{
...
...
lib/Doctrine/DBAL/Id/TableGenerator.php
View file @
32b1a4f8
...
...
@@ -156,7 +156,7 @@ class TableGenerator
$this
->
conn
->
commit
();
}
catch
(
\Exception
$e
)
{
$this
->
conn
->
roll
b
ack
();
$this
->
conn
->
roll
B
ack
();
throw
new
\Doctrine\DBAL\DBALException
(
"Error occurred while generating ID with TableGenerator, aborted generation: "
.
$e
->
getMessage
(),
0
,
$e
);
}
...
...
lib/Doctrine/DBAL/Platforms/DB2Platform.php
View file @
32b1a4f8
...
...
@@ -20,7 +20,6 @@
namespace
Doctrine\DBAL\Platforms
;
use
Doctrine\DBAL\DBALException
;
use
Doctrine\DBAL\Schema\Column
;
use
Doctrine\DBAL\Schema\ColumnDiff
;
use
Doctrine\DBAL\Schema\Identifier
;
use
Doctrine\DBAL\Schema\Index
;
...
...
lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
View file @
32b1a4f8
...
...
@@ -49,6 +49,12 @@ class MySqlPlatform extends AbstractPlatform
/**
* Adds MySQL-specific LIMIT clause to the query
* 18446744073709551615 is 2^64-1 maximum of unsigned BIGINT the biggest limit possible
*
* @param string $query
* @param integer $limit
* @param integer $offset
*
* @return string
*/
protected
function
doModifyLimitQuery
(
$query
,
$limit
,
$offset
)
{
...
...
@@ -346,6 +352,9 @@ class MySqlPlatform extends AbstractPlatform
return
true
;
}
/**
* {@inheritDoc}
*/
public
function
getListTablesSQL
()
{
return
"SHOW FULL TABLES WHERE Table_type = 'BASE TABLE'"
;
...
...
lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
View file @
32b1a4f8
...
...
@@ -517,7 +517,7 @@ class PostgreSqlPlatform extends AbstractPlatform
}
if
(
$columnDiff
->
hasChanged
(
'notnull'
))
{
$query
=
'ALTER '
.
$oldColumnName
.
' '
.
(
$column
->
getNot
N
ull
()
?
'SET'
:
'DROP'
)
.
' NOT NULL'
;
$query
=
'ALTER '
.
$oldColumnName
.
' '
.
(
$column
->
getNot
n
ull
()
?
'SET'
:
'DROP'
)
.
' NOT NULL'
;
$sql
[]
=
'ALTER TABLE '
.
$diff
->
getName
(
$this
)
->
getQuotedName
(
$this
)
.
' '
.
$query
;
}
...
...
lib/Doctrine/DBAL/Query/QueryBuilder.php
View file @
32b1a4f8
...
...
@@ -1302,6 +1302,8 @@ class QueryBuilder
* @param array $knownAliases
*
* @return string
*
* @throws QueryException
*/
private
function
getSQLForJoins
(
$fromAlias
,
array
&
$knownAliases
)
{
...
...
lib/Doctrine/DBAL/Schema/Schema.php
View file @
32b1a4f8
...
...
@@ -313,6 +313,8 @@ class Schema extends AbstractAsset
* @param string $namespaceName The name of the namespace to create.
*
* @return \Doctrine\DBAL\Schema\Schema This schema instance.
*
* @throws SchemaException
*/
public
function
createNamespace
(
$namespaceName
)
{
...
...
lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php
View file @
32b1a4f8
...
...
@@ -418,6 +418,12 @@ class SqliteSchemaManager extends AbstractSchemaManager
return
$tableDiff
;
}
/**
* @param string $column
* @param string $sql
*
* @return string|false
*/
private
function
parseColumnCollationFromSQL
(
$column
,
$sql
)
{
if
(
preg_match
(
...
...
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