@@ -37,13 +37,13 @@ |
||
| 37 | 37 | ['BINARY', 'b', 'CREATE TABLE "a" (bbb TEXT COLLATE NOCASE, bb TEXT COLLATE RTRIM, b VARCHAR(42) NOT NULL COLLATE BINARY)'], |
| 38 | 38 | ['BINARY', 'b', 'CREATE TABLE "a" (b VARCHAR(42) NOT NULL COLLATE BINARY, bb TEXT COLLATE RTRIM)'], |
| 39 | 39 | ['utf-8', 'bar#', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) COLLATE "utf-8" NOT NULL, "bar#" VARCHAR(255) COLLATE "utf-8" NOT NULL, baz VARCHAR(255) COLLATE "utf-8" NOT NULL, PRIMARY KEY(id))'], |
| 40 | - [null, 'bar#', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar#" VARCHAR(255) NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'], |
|
| 41 | - ['utf-8', 'baz', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) COLLATE "utf-8" NOT NULL, "bar#" INTEGER NOT NULL, baz VARCHAR(255) COLLATE "utf-8" NOT NULL, PRIMARY KEY(id))'], |
|
| 42 | - [null, 'baz', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar#" INTEGER NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'], |
|
| 40 | + [null, 'bar#', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar#" VARCHAR(255) NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'], |
|
| 41 | + ['utf-8', 'baz', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) COLLATE "utf-8" NOT NULL, "bar#" INTEGER NOT NULL, baz VARCHAR(255) COLLATE "utf-8" NOT NULL, PRIMARY KEY(id))'], |
|
| 42 | + [null, 'baz', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar#" INTEGER NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'], |
|
| 43 | 43 | ['utf-8', 'bar/', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) COLLATE "utf-8" NOT NULL, "bar/" VARCHAR(255) COLLATE "utf-8" NOT NULL, baz VARCHAR(255) COLLATE "utf-8" NOT NULL, PRIMARY KEY(id))'], |
| 44 | - [null, 'bar/', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar/" VARCHAR(255) NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'], |
|
| 45 | - ['utf-8', 'baz', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) COLLATE "utf-8" NOT NULL, "bar/" INTEGER NOT NULL, baz VARCHAR(255) COLLATE "utf-8" NOT NULL, PRIMARY KEY(id))'], |
|
| 46 | - [null, 'baz', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar/" INTEGER NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'], |
|
| 44 | + [null, 'bar/', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar/" VARCHAR(255) NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'], |
|
| 45 | + ['utf-8', 'baz', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) COLLATE "utf-8" NOT NULL, "bar/" INTEGER NOT NULL, baz VARCHAR(255) COLLATE "utf-8" NOT NULL, PRIMARY KEY(id))'], |
|
| 46 | + [null, 'baz', 'CREATE TABLE dummy_table (id INTEGER NOT NULL, foo VARCHAR(255) NOT NULL, "bar/" INTEGER NOT NULL, baz VARCHAR(255) NOT NULL, PRIMARY KEY(id))'], |
|
| 47 | 47 | ]; |
| 48 | 48 | } |
| 49 | 49 | |
@@ -42,44 +42,44 @@ |
||
| 42 | 42 | ->will($this->returnValue('create_schema')); |
| 43 | 43 | if ($unsafe) { |
| 44 | 44 | $platform->expects($this->exactly(1)) |
| 45 | - ->method('getDropSequenceSql') |
|
| 46 | - ->with($this->isInstanceOf('Doctrine\DBAL\Schema\Sequence')) |
|
| 47 | - ->will($this->returnValue('drop_seq')); |
|
| 45 | + ->method('getDropSequenceSql') |
|
| 46 | + ->with($this->isInstanceOf('Doctrine\DBAL\Schema\Sequence')) |
|
| 47 | + ->will($this->returnValue('drop_seq')); |
|
| 48 | 48 | } |
| 49 | 49 | $platform->expects($this->exactly(1)) |
| 50 | - ->method('getAlterSequenceSql') |
|
| 51 | - ->with($this->isInstanceOf('Doctrine\DBAL\Schema\Sequence')) |
|
| 52 | - ->will($this->returnValue('alter_seq')); |
|
| 50 | + ->method('getAlterSequenceSql') |
|
| 51 | + ->with($this->isInstanceOf('Doctrine\DBAL\Schema\Sequence')) |
|
| 52 | + ->will($this->returnValue('alter_seq')); |
|
| 53 | 53 | $platform->expects($this->exactly(1)) |
| 54 | - ->method('getCreateSequenceSql') |
|
| 55 | - ->with($this->isInstanceOf('Doctrine\DBAL\Schema\Sequence')) |
|
| 56 | - ->will($this->returnValue('create_seq')); |
|
| 54 | + ->method('getCreateSequenceSql') |
|
| 55 | + ->with($this->isInstanceOf('Doctrine\DBAL\Schema\Sequence')) |
|
| 56 | + ->will($this->returnValue('create_seq')); |
|
| 57 | 57 | if ($unsafe) { |
| 58 | 58 | $platform->expects($this->exactly(1)) |
| 59 | - ->method('getDropTableSql') |
|
| 60 | - ->with($this->isInstanceof('Doctrine\DBAL\Schema\Table')) |
|
| 61 | - ->will($this->returnValue('drop_table')); |
|
| 59 | + ->method('getDropTableSql') |
|
| 60 | + ->with($this->isInstanceof('Doctrine\DBAL\Schema\Table')) |
|
| 61 | + ->will($this->returnValue('drop_table')); |
|
| 62 | 62 | } |
| 63 | 63 | $platform->expects($this->exactly(1)) |
| 64 | - ->method('getCreateTableSql') |
|
| 65 | - ->with($this->isInstanceof('Doctrine\DBAL\Schema\Table')) |
|
| 66 | - ->will($this->returnValue(array('create_table'))); |
|
| 64 | + ->method('getCreateTableSql') |
|
| 65 | + ->with($this->isInstanceof('Doctrine\DBAL\Schema\Table')) |
|
| 66 | + ->will($this->returnValue(array('create_table'))); |
|
| 67 | 67 | $platform->expects($this->exactly(1)) |
| 68 | - ->method('getCreateForeignKeySQL') |
|
| 69 | - ->with($this->isInstanceOf('Doctrine\DBAL\Schema\ForeignKeyConstraint')) |
|
| 70 | - ->will($this->returnValue('create_foreign_key')); |
|
| 68 | + ->method('getCreateForeignKeySQL') |
|
| 69 | + ->with($this->isInstanceOf('Doctrine\DBAL\Schema\ForeignKeyConstraint')) |
|
| 70 | + ->will($this->returnValue('create_foreign_key')); |
|
| 71 | 71 | $platform->expects($this->exactly(1)) |
| 72 | - ->method('getAlterTableSql') |
|
| 73 | - ->with($this->isInstanceOf('Doctrine\DBAL\Schema\TableDiff')) |
|
| 74 | - ->will($this->returnValue(array('alter_table'))); |
|
| 72 | + ->method('getAlterTableSql') |
|
| 73 | + ->with($this->isInstanceOf('Doctrine\DBAL\Schema\TableDiff')) |
|
| 74 | + ->will($this->returnValue(array('alter_table'))); |
|
| 75 | 75 | if ($unsafe) { |
| 76 | 76 | $platform->expects($this->exactly(1)) |
| 77 | - ->method('getDropForeignKeySql') |
|
| 78 | - ->with( |
|
| 79 | - $this->isInstanceof('Doctrine\DBAL\Schema\ForeignKeyConstraint'), |
|
| 80 | - $this->isInstanceOf('Doctrine\DBAL\Schema\Table') |
|
| 81 | - ) |
|
| 82 | - ->will($this->returnValue('drop_orphan_fk')); |
|
| 77 | + ->method('getDropForeignKeySql') |
|
| 78 | + ->with( |
|
| 79 | + $this->isInstanceof('Doctrine\DBAL\Schema\ForeignKeyConstraint'), |
|
| 80 | + $this->isInstanceOf('Doctrine\DBAL\Schema\Table') |
|
| 81 | + ) |
|
| 82 | + ->will($this->returnValue('drop_orphan_fk')); |
|
| 83 | 83 | } |
| 84 | 84 | $platform->expects($this->exactly(1)) |
| 85 | 85 | ->method('supportsSchemas') |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | public function testGetName() |
| 24 | 24 | { |
| 25 | - $table = new Table("foo", array(), array(), array()); |
|
| 25 | + $table = new Table("foo", array(), array(), array()); |
|
| 26 | 26 | self::assertEquals("foo", $table->getName()); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | $this->expectException("Doctrine\DBAL\Schema\SchemaException"); |
| 254 | 254 | |
| 255 | 255 | $table = new Table("foo"); |
| 256 | - $table->addColumn("bar",'integer'); |
|
| 256 | + $table->addColumn("bar", 'integer'); |
|
| 257 | 257 | $table->addIndex(array("bar"), "invalid name %&/"); |
| 258 | 258 | } |
| 259 | 259 | |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | $synchronizer = new SQLAzureFederationsSynchronizer($this->conn, $this->sm); |
| 13 | 13 | $sql = $synchronizer->getCreateSchema($schema); |
| 14 | 14 | |
| 15 | - self::assertEquals(array ( |
|
| 15 | + self::assertEquals(array( |
|
| 16 | 16 | "--Create Federation\nCREATE FEDERATION Orders_Federation (CustID INT RANGE)", |
| 17 | 17 | "USE FEDERATION Orders_Federation (CustID = 0) WITH RESET, FILTERING = OFF;", |
| 18 | 18 | "CREATE TABLE Products (ProductID INT NOT NULL, SupplierID INT NOT NULL, ProductName NVARCHAR(255) NOT NULL, Price NUMERIC(12, 2) NOT NULL, PRIMARY KEY (ProductID))", |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | |
| 22 | 22 | protected function setUp() |
| 23 | 23 | { |
| 24 | - if (!isset($GLOBALS['db_type']) || strpos($GLOBALS['db_type'], "sqlsrv") === false) { |
|
| 24 | + if ( ! isset($GLOBALS['db_type']) || strpos($GLOBALS['db_type'], "sqlsrv") === false) { |
|
| 25 | 25 | $this->markTestSkipped('No driver or sqlserver driver specified.'); |
| 26 | 26 | } |
| 27 | 27 | |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | { |
| 35 | 35 | $mock = $this->createMock('Doctrine\DBAL\Sharding\ShardChoser\ShardChoser'); |
| 36 | 36 | $mock->expects($this->any()) |
| 37 | - ->method('pickShard') |
|
| 38 | - ->will($this->returnCallback(function($value) { return $value; })); |
|
| 37 | + ->method('pickShard') |
|
| 38 | + ->will($this->returnCallback(function($value) { return $value; })); |
|
| 39 | 39 | return $mock; |
| 40 | 40 | } |
| 41 | 41 | |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | )); |
| 103 | 103 | $conn->expects($this->at(2))->method('connect')->with($this->equalTo(1)); |
| 104 | 104 | $conn->expects($this->at(3)) |
| 105 | - ->method('fetchAll') |
|
| 106 | - ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types)) |
|
| 107 | - ->will($this->returnValue(array( array('id' => 1) ) )); |
|
| 105 | + ->method('fetchAll') |
|
| 106 | + ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types)) |
|
| 107 | + ->will($this->returnValue(array( array('id' => 1) ) )); |
|
| 108 | 108 | $conn->expects($this->at(4))->method('connect')->with($this->equalTo(2)); |
| 109 | 109 | $conn->expects($this->at(5)) |
| 110 | - ->method('fetchAll') |
|
| 111 | - ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types)) |
|
| 112 | - ->will($this->returnValue(array( array('id' => 2) ) )); |
|
| 110 | + ->method('fetchAll') |
|
| 111 | + ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types)) |
|
| 112 | + ->will($this->returnValue(array( array('id' => 2) ) )); |
|
| 113 | 113 | |
| 114 | 114 | $shardManager = new PoolingShardManager($conn, $this->createPassthroughShardChoser()); |
| 115 | 115 | $result = $shardManager->queryAll($sql, $params, $types); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | $conn = $this->createConnectionMock(); |
| 78 | 78 | $conn->expects($this->any())->method('getParams')->will( |
| 79 | 79 | $this->returnValue( |
| 80 | - array('shards' => array( array('id' => 1), array('id' => 2) ), 'shardChoser' => $this->createPassthroughShardChoser()) |
|
| 80 | + array('shards' => array(array('id' => 1), array('id' => 2)), 'shardChoser' => $this->createPassthroughShardChoser()) |
|
| 81 | 81 | ) |
| 82 | 82 | ); |
| 83 | 83 | |
@@ -95,21 +95,21 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | $conn = $this->createConnectionMock(); |
| 97 | 97 | $conn->expects($this->at(0))->method('getParams')->will($this->returnValue( |
| 98 | - array('shards' => array( array('id' => 1), array('id' => 2) ), 'shardChoser' => $this->createPassthroughShardChoser()) |
|
| 98 | + array('shards' => array(array('id' => 1), array('id' => 2)), 'shardChoser' => $this->createPassthroughShardChoser()) |
|
| 99 | 99 | )); |
| 100 | 100 | $conn->expects($this->at(1))->method('getParams')->will($this->returnValue( |
| 101 | - array('shards' => array( array('id' => 1), array('id' => 2) ), 'shardChoser' => $this->createPassthroughShardChoser()) |
|
| 101 | + array('shards' => array(array('id' => 1), array('id' => 2)), 'shardChoser' => $this->createPassthroughShardChoser()) |
|
| 102 | 102 | )); |
| 103 | 103 | $conn->expects($this->at(2))->method('connect')->with($this->equalTo(1)); |
| 104 | 104 | $conn->expects($this->at(3)) |
| 105 | 105 | ->method('fetchAll') |
| 106 | 106 | ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types)) |
| 107 | - ->will($this->returnValue(array( array('id' => 1) ) )); |
|
| 107 | + ->will($this->returnValue(array(array('id' => 1)))); |
|
| 108 | 108 | $conn->expects($this->at(4))->method('connect')->with($this->equalTo(2)); |
| 109 | 109 | $conn->expects($this->at(5)) |
| 110 | 110 | ->method('fetchAll') |
| 111 | 111 | ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types)) |
| 112 | - ->will($this->returnValue(array( array('id' => 2) ) )); |
|
| 112 | + ->will($this->returnValue(array(array('id' => 2)))); |
|
| 113 | 113 | |
| 114 | 114 | $shardManager = new PoolingShardManager($conn, $this->createPassthroughShardChoser()); |
| 115 | 115 | $result = $shardManager->queryAll($sql, $params, $types); |
@@ -125,21 +125,21 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | $conn = $this->createConnectionMock(); |
| 127 | 127 | $conn->expects($this->at(0))->method('getParams')->will($this->returnValue( |
| 128 | - array('shards' => array( array('id' => 1), array('id' => 2) ), 'shardChoser' => $this->createStaticShardChoser()) |
|
| 128 | + array('shards' => array(array('id' => 1), array('id' => 2)), 'shardChoser' => $this->createStaticShardChoser()) |
|
| 129 | 129 | )); |
| 130 | 130 | $conn->expects($this->at(1))->method('getParams')->will($this->returnValue( |
| 131 | - array('shards' => array( array('id' => 1), array('id' => 2) ), 'shardChoser' => $this->createStaticShardChoser()) |
|
| 131 | + array('shards' => array(array('id' => 1), array('id' => 2)), 'shardChoser' => $this->createStaticShardChoser()) |
|
| 132 | 132 | )); |
| 133 | 133 | $conn->expects($this->at(2))->method('connect')->with($this->equalTo(1)); |
| 134 | 134 | $conn->expects($this->at(3)) |
| 135 | 135 | ->method('fetchAll') |
| 136 | 136 | ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types)) |
| 137 | - ->will($this->returnValue(array( array('id' => 1) ) )); |
|
| 137 | + ->will($this->returnValue(array(array('id' => 1)))); |
|
| 138 | 138 | $conn->expects($this->at(4))->method('connect')->with($this->equalTo(2)); |
| 139 | 139 | $conn->expects($this->at(5)) |
| 140 | 140 | ->method('fetchAll') |
| 141 | 141 | ->with($this->equalTo($sql), $this->equalTo($params), $this->equalTo($types)) |
| 142 | - ->will($this->returnValue(array( array('id' => 2) ) )); |
|
| 142 | + ->will($this->returnValue(array(array('id' => 2)))); |
|
| 143 | 143 | |
| 144 | 144 | $shardManager = new PoolingShardManager($conn, $this->createStaticShardChoser()); |
| 145 | 145 | $result = $shardManager->queryAll($sql, $params, $types); |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | array(ParameterType::INTEGER), |
| 222 | 222 | ), |
| 223 | 223 | |
| 224 | - // Named parameters : Very simple with param int and string |
|
| 224 | + // Named parameters : Very simple with param int and string |
|
| 225 | 225 | array( |
| 226 | 226 | "SELECT * FROM Foo WHERE foo = :foo AND bar = :bar", |
| 227 | 227 | array('bar'=>'Some String','foo'=>1), |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | array("Some String","Some String"), |
| 285 | 285 | array(ParameterType::STRING,ParameterType::STRING,) |
| 286 | 286 | ), |
| 287 | - // Named parameters : With the same name arg |
|
| 287 | + // Named parameters : With the same name arg |
|
| 288 | 288 | array( |
| 289 | 289 | "SELECT * FROM Foo WHERE foo IN (:arg) AND NOT bar IN (:arg)", |
| 290 | 290 | array('arg'=>array(1, 2, 3)), |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | array(ParameterType::INTEGER,ParameterType::INTEGER, ParameterType::INTEGER,ParameterType::INTEGER,ParameterType::INTEGER, ParameterType::INTEGER) |
| 295 | 295 | ), |
| 296 | 296 | |
| 297 | - // Named parameters : Same name, other name in between DBAL-299 |
|
| 297 | + // Named parameters : Same name, other name in between DBAL-299 |
|
| 298 | 298 | array( |
| 299 | 299 | "SELECT * FROM Foo WHERE (:foo = 2) AND (:bar = 3) AND (:foo = 2)", |
| 300 | 300 | array('foo'=>2,'bar'=>3), |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | array(2, 3, 2), |
| 304 | 304 | array(ParameterType::INTEGER, ParameterType::INTEGER, ParameterType::INTEGER) |
| 305 | 305 | ), |
| 306 | - // Named parameters : Empty "integer" array DDC-1978 |
|
| 306 | + // Named parameters : Empty "integer" array DDC-1978 |
|
| 307 | 307 | array( |
| 308 | 308 | "SELECT * FROM Foo WHERE foo IN (:foo)", |
| 309 | 309 | array('foo'=>array()), |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | array(), |
| 313 | 313 | array() |
| 314 | 314 | ), |
| 315 | - // Named parameters : Two empty "str" array DDC-1978 |
|
| 315 | + // Named parameters : Two empty "str" array DDC-1978 |
|
| 316 | 316 | array( |
| 317 | 317 | "SELECT * FROM Foo WHERE foo IN (:foo) OR bar IN (:bar)", |
| 318 | 318 | array('foo'=>array(), 'bar'=>array()), |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | array(), |
| 440 | 440 | array('bar' => Connection::PARAM_INT_ARRAY), |
| 441 | 441 | ), |
| 442 | - array( |
|
| 442 | + array( |
|
| 443 | 443 | "SELECT * FROM foo WHERE bar = :param", |
| 444 | 444 | array('bar' => 'value'), |
| 445 | 445 | array('bar' => Connection::PARAM_INT_ARRAY), |
@@ -224,10 +224,10 @@ discard block |
||
| 224 | 224 | // Named parameters : Very simple with param int and string |
| 225 | 225 | array( |
| 226 | 226 | "SELECT * FROM Foo WHERE foo = :foo AND bar = :bar", |
| 227 | - array('bar'=>'Some String','foo'=>1), |
|
| 227 | + array('bar'=>'Some String', 'foo'=>1), |
|
| 228 | 228 | array('foo' => ParameterType::INTEGER, 'bar' => ParameterType::STRING), |
| 229 | 229 | 'SELECT * FROM Foo WHERE foo = ? AND bar = ?', |
| 230 | - array(1,'Some String'), |
|
| 230 | + array(1, 'Some String'), |
|
| 231 | 231 | array(ParameterType::INTEGER, ParameterType::STRING) |
| 232 | 232 | ), |
| 233 | 233 | // Named parameters : Very simple with one needle |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | // Named parameters: One non-list before and one after list-needle |
| 261 | 261 | array( |
| 262 | 262 | "SELECT * FROM Foo WHERE foo = :foo AND bar IN (:bar) AND baz = :baz", |
| 263 | - array('bar'=>array(1, 2, 3),'foo'=>1, 'baz'=>4), |
|
| 263 | + array('bar'=>array(1, 2, 3), 'foo'=>1, 'baz'=>4), |
|
| 264 | 264 | array('bar'=>Connection::PARAM_INT_ARRAY, 'foo'=>ParameterType::INTEGER, 'baz'=>ParameterType::INTEGER), |
| 265 | 265 | 'SELECT * FROM Foo WHERE foo = ? AND bar IN (?, ?, ?) AND baz = ?', |
| 266 | 266 | array(1, 1, 2, 3, 4), |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | // Named parameters: Two lists |
| 270 | 270 | array( |
| 271 | 271 | "SELECT * FROM Foo WHERE foo IN (:a, :b)", |
| 272 | - array('b'=>array(4, 5),'a'=>array(1, 2, 3)), |
|
| 272 | + array('b'=>array(4, 5), 'a'=>array(1, 2, 3)), |
|
| 273 | 273 | array('a'=>Connection::PARAM_INT_ARRAY, 'b'=>Connection::PARAM_INT_ARRAY), |
| 274 | 274 | 'SELECT * FROM Foo WHERE foo IN (?, ?, ?, ?, ?)', |
| 275 | 275 | array(1, 2, 3, 4, 5), |
@@ -281,8 +281,8 @@ discard block |
||
| 281 | 281 | array('arg'=>"Some String"), |
| 282 | 282 | array('arg'=>ParameterType::STRING), |
| 283 | 283 | 'SELECT * FROM Foo WHERE foo <> ? AND bar = ?', |
| 284 | - array("Some String","Some String"), |
|
| 285 | - array(ParameterType::STRING,ParameterType::STRING,) |
|
| 284 | + array("Some String", "Some String"), |
|
| 285 | + array(ParameterType::STRING, ParameterType::STRING,) |
|
| 286 | 286 | ), |
| 287 | 287 | // Named parameters : With the same name arg |
| 288 | 288 | array( |
@@ -291,14 +291,14 @@ discard block |
||
| 291 | 291 | array('arg'=>Connection::PARAM_INT_ARRAY), |
| 292 | 292 | 'SELECT * FROM Foo WHERE foo IN (?, ?, ?) AND NOT bar IN (?, ?, ?)', |
| 293 | 293 | array(1, 2, 3, 1, 2, 3), |
| 294 | - array(ParameterType::INTEGER,ParameterType::INTEGER, ParameterType::INTEGER,ParameterType::INTEGER,ParameterType::INTEGER, ParameterType::INTEGER) |
|
| 294 | + array(ParameterType::INTEGER, ParameterType::INTEGER, ParameterType::INTEGER, ParameterType::INTEGER, ParameterType::INTEGER, ParameterType::INTEGER) |
|
| 295 | 295 | ), |
| 296 | 296 | |
| 297 | 297 | // Named parameters : Same name, other name in between DBAL-299 |
| 298 | 298 | array( |
| 299 | 299 | "SELECT * FROM Foo WHERE (:foo = 2) AND (:bar = 3) AND (:foo = 2)", |
| 300 | - array('foo'=>2,'bar'=>3), |
|
| 301 | - array('foo'=>ParameterType::INTEGER,'bar'=>ParameterType::INTEGER), |
|
| 300 | + array('foo'=>2, 'bar'=>3), |
|
| 301 | + array('foo'=>ParameterType::INTEGER, 'bar'=>ParameterType::INTEGER), |
|
| 302 | 302 | 'SELECT * FROM Foo WHERE (? = 2) AND (? = 3) AND (? = 2)', |
| 303 | 303 | array(2, 3, 2), |
| 304 | 304 | array(ParameterType::INTEGER, ParameterType::INTEGER, ParameterType::INTEGER) |
@@ -14,8 +14,8 @@ |
||
| 14 | 14 | { |
| 15 | 15 | $connectionMock = $this->createMock('Doctrine\DBAL\Connection'); |
| 16 | 16 | $connectionMock->expects($this->once()) |
| 17 | - ->method('executeUpdate') |
|
| 18 | - ->with($this->isType('string')); |
|
| 17 | + ->method('executeUpdate') |
|
| 18 | + ->with($this->isType('string')); |
|
| 19 | 19 | |
| 20 | 20 | $eventArgs = new ConnectionEventArgs($connectionMock); |
| 21 | 21 | |
@@ -13,8 +13,8 @@ |
||
| 13 | 13 | { |
| 14 | 14 | $connectionMock = $this->createMock('Doctrine\DBAL\Connection'); |
| 15 | 15 | $connectionMock->expects($this->once()) |
| 16 | - ->method('executeUpdate') |
|
| 17 | - ->with($this->equalTo("SET NAMES foo COLLATE bar")); |
|
| 16 | + ->method('executeUpdate') |
|
| 17 | + ->with($this->equalTo("SET NAMES foo COLLATE bar")); |
|
| 18 | 18 | |
| 19 | 19 | $eventArgs = new ConnectionEventArgs($connectionMock); |
| 20 | 20 | |