Skip to content

Commit ad5354d

Browse files
rkrxrkrx
committed
Removed ; at the end of each statement
1 parent ea8c7a4 commit ad5354d

File tree

8 files changed

+52
-57
lines changed

8 files changed

+52
-57
lines changed

‎src/Builder/Delete.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public function __toString() {
5454
$query = $this->buildOrder($query);
5555
$query = $this->buildLimit($query);
5656
$query = $this->buildOffset($query);
57-
$query .= ";\n";
5857
return $query;
5958
}
6059
}

‎src/Builder/Insert.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public function __toString() {
214214
if($this->from !== null) {
215215
$fields = $this->from->getFields();
216216
$queryArr[] = sprintf("\t(%s)\n", join(', ', array_keys($fields)));
217-
$queryArr[] = trim(trim($this->from), ';');
217+
$queryArr[] = $this->from;
218218
} else {
219219
$fields = $this->fields;
220220
$insertData = $this->buildFieldList($fields);
@@ -229,8 +229,6 @@ public function __toString() {
229229
$queryArr[] = "{$updateData}\n";
230230
}
231231

232-
$queryArr[] = ";\n";
233-
234232
$query = join('', $queryArr);
235233

236234
return $query;

‎src/Builder/Select.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ public function __toString() {
140140
$query = $this->buildLimit($query);
141141
$query = $this->buildOffset($query);
142142
$query = $this->buildForUpdate($query);
143-
$query .= ";\n";
144143
return $query;
145144
}
146145

‎src/Builder/Update.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ public function __toString() {
105105
$query = $this->buildOrder($query);
106106
$query = $this->buildLimit($query);
107107
$query = $this->buildOffset($query);
108-
$query .= ";\n";
109108
return $query;
110109
}
111110

‎tests/Builder/DeleteTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public function testAlias() {
99
->from('t', 'travis#test1')
1010
->where('t.a = 1')
1111
->asString();
12-
$this->assertEquals("DELETE t FROM\n\ttravis_test.test1 t\nWHERE\n\t(t.a = 1)\n;\n", $query);
12+
$this->assertEquals("DELETE t FROM\n\ttravis_test.test1 t\nWHERE\n\t(t.a = 1)\n", $query);
1313
}
1414

1515
public function testMultipleTables() {
@@ -18,15 +18,15 @@ public function testMultipleTables() {
1818
->from('t2', 'travis#test2')
1919
->where('t1.a = 1')
2020
->asString();
21-
$this->assertEquals("DELETE t1, t2 FROM\n\ttravis_test.test1 t1,\n\ttravis_test.test2 t2\nWHERE\n\t(t1.a = 1)\n;\n", $sql);
21+
$this->assertEquals("DELETE t1, t2 FROM\n\ttravis_test.test1 t1,\n\ttravis_test.test2 t2\nWHERE\n\t(t1.a = 1)\n", $sql);
2222
}
2323

2424
public function testJoins() {
2525
$sql = TestDelete::create()
2626
->from('t1', 'travis#test1')
2727
->joinInner('t2', 'travis#test2', 't1.id = t2.id')
2828
->asString();
29-
$this->assertEquals("DELETE t1 FROM\n\ttravis_test.test1 t1\nINNER JOIN\n\ttravis_test.test2 t2 ON t1.id = t2.id\n;\n", $sql);
29+
$this->assertEquals("DELETE t1 FROM\n\ttravis_test.test1 t1\nINNER JOIN\n\ttravis_test.test2 t2 ON t1.id = t2.id\n", $sql);
3030
}
3131

3232
public function testWhere() {
@@ -35,30 +35,30 @@ public function testWhere() {
3535
->where('field1=?', 1)
3636
->where('field2 != field1')
3737
->asString();
38-
$this->assertEquals("DELETE FROM\n\ttravis_test.test1\nWHERE\n\t(field1='1')\n\tAND\n\t(field2 != field1)\n;\n", $sql);
38+
$this->assertEquals("DELETE FROM\n\ttravis_test.test1\nWHERE\n\t(field1='1')\n\tAND\n\t(field2 != field1)\n", $sql);
3939
}
4040

4141
public function testOrderBy() {
4242
$sql = TestDelete::create()
4343
->from('travis#test1')
4444
->orderBy('field1', 'DESC')
4545
->asString();
46-
$this->assertEquals("DELETE FROM\n\ttravis_test.test1\nORDER BY\n\tfield1 DESC\n;\n", $sql);
46+
$this->assertEquals("DELETE FROM\n\ttravis_test.test1\nORDER BY\n\tfield1 DESC\n", $sql);
4747
}
4848

4949
public function testLimit() {
5050
$sql = TestDelete::create()
5151
->from('travis#test1')
5252
->limit(10)
5353
->asString();
54-
$this->assertEquals("DELETE FROM\n\ttravis_test.test1\nLIMIT\n\t10\n;\n", $sql);
54+
$this->assertEquals("DELETE FROM\n\ttravis_test.test1\nLIMIT\n\t10\n", $sql);
5555
}
5656

5757
public function testOffset() {
5858
$sql = TestDelete::create()
5959
->from('travis#test1')
6060
->offset(10)
6161
->asString();
62-
$this->assertEquals("DELETE FROM\n\ttravis_test.test1\nOFFSET\n\t10\n;\n", $sql);
62+
$this->assertEquals("DELETE FROM\n\ttravis_test.test1\nOFFSET\n\t10\n", $sql);
6363
}
6464
}

‎tests/Builder/InsertTest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ public function testAlias() {
1111
->into('travis#test1')
1212
->addExpr('last_update=NOW()')
1313
->asString();
14-
$this->assertEquals("INSERT INTO\n\ttravis_test.test1\nSET\n\tlast_update=NOW()\n;\n", $query);
14+
$this->assertEquals("INSERT INTO\n\ttravis_test.test1\nSET\n\tlast_update=NOW()\n", $query);
1515
}
1616

1717
public function testAddExpr() {
1818
$query = TestInsert::create()
1919
->into('test1')
2020
->addExpr('last_update=NOW()')
2121
->asString();
22-
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\tlast_update=NOW()\n;\n", $query);
22+
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\tlast_update=NOW()\n", $query);
2323
}
2424

2525
public function testMassInsert() {
@@ -34,7 +34,7 @@ public function testMassInsert() {
3434
->updateExpr('a = VALUES(a)')
3535
->asString();
3636

37-
$this->assertEquals("INSERT INTO\n\ttravis_test.test2\n\t(a)\nSELECT\n\tb AS `a`\nFROM\n\ttravis_test.test1 oi\nWHERE\n\t(1!=2)\nON DUPLICATE KEY UPDATE\n\ta = VALUES(a)\n;\n", $query);
37+
$this->assertEquals("INSERT INTO\n\ttravis_test.test2\n\t(a)\nSELECT\n\tb AS `a`\nFROM\n\ttravis_test.test1 oi\nWHERE\n\t(1!=2)\nON DUPLICATE KEY UPDATE\n\ta = VALUES(a)\n", $query);
3838
}
3939

4040
public function testAddAll() {
@@ -52,19 +52,19 @@ public function testAddAll() {
5252
->into('test1')
5353
->addAll(['field1' => 123, 'field2' => 456])
5454
->asString();
55-
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123',\n\t`field2`='456'\n;\n", $query);
55+
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123',\n\t`field2`='456'\n", $query);
5656

5757
$query = (new TestInsert($db))
5858
->into('test1')
5959
->addAll(['field1' => 123, 'field2' => 456], ['field1'])
6060
->asString();
61-
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123'\n;\n", $query);
61+
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123'\n", $query);
6262

6363
$query = (new TestInsert($db))
6464
->into('travis#test1')
6565
->addAll(['field1' => 123, 'field2' => 456], ['field1'])
6666
->asString();
67-
$this->assertEquals("INSERT INTO\n\ttravis_test.test1\nSET\n\t`field1`='123'\n;\n", $query);
67+
$this->assertEquals("INSERT INTO\n\ttravis_test.test1\nSET\n\t`field1`='123'\n", $query);
6868
}
6969

7070
public function testUpdateAll() {
@@ -83,21 +83,21 @@ public function testUpdateAll() {
8383
->add('field1', 123)
8484
->updateAll(['field1' => 123, 'field2' => 456])
8585
->asString();
86-
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123',\n\t`field2`='456'\n;\n", $query);
86+
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123',\n\t`field2`='456'\n", $query);
8787

8888
$query = (new TestInsert($db))
8989
->into('test1')
9090
->add('field1', 123)
9191
->updateAll(['field1' => 123, 'field2' => 456], ['field1'])
9292
->asString();
93-
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123'\n;\n", $query);
93+
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123'\n", $query);
9494

9595
$query = (new TestInsert($db))
9696
->into('travis#test1')
9797
->add('field1', 123)
9898
->updateAll(['field1' => 123, 'field2' => 456], ['field1'])
9999
->asString();
100-
$this->assertEquals("INSERT INTO\n\ttravis_test.test1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123'\n;\n", $query);
100+
$this->assertEquals("INSERT INTO\n\ttravis_test.test1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123'\n", $query);
101101
}
102102

103103
public function testAddOrUpdateAll() {
@@ -115,19 +115,19 @@ public function testAddOrUpdateAll() {
115115
->into('test1')
116116
->addOrUpdateAll(['field1' => 123, 'field2' => 456])
117117
->asString();
118-
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123',\n\t`field2`='456'\nON DUPLICATE KEY UPDATE\n\t`field1`='123',\n\t`field2`='456'\n;\n", $query);
118+
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123',\n\t`field2`='456'\nON DUPLICATE KEY UPDATE\n\t`field1`='123',\n\t`field2`='456'\n", $query);
119119

120120
$query = (new TestInsert($db))
121121
->into('test1')
122122
->addOrUpdateAll(['field1' => 123, 'field2' => 456], ['field1'])
123123
->asString();
124-
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123'\n;\n", $query);
124+
$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123'\n", $query);
125125

126126
$query = (new TestInsert($db))
127127
->into('travis#test1')
128128
->addOrUpdateAll(['field1' => 123, 'field2' => 456], ['field1'])
129129
->asString();
130-
$this->assertEquals("INSERT INTO\n\ttravis_test.test1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123'\n;\n", $query);
130+
$this->assertEquals("INSERT INTO\n\ttravis_test.test1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123'\n", $query);
131131
}
132132

133133
public function testMask() {
@@ -137,6 +137,6 @@ public function testMask() {
137137
->addOrUpdate('field2', 2)
138138
->setMask(['field1'])
139139
->asString();
140-
$this->assertEquals("INSERT INTO\n\ttest\nSET\n\t`field1`='1'\nON DUPLICATE KEY UPDATE\n\t`field1`='1'\n;\n", $sql);
140+
$this->assertEquals("INSERT INTO\n\ttest\nSET\n\t`field1`='1'\nON DUPLICATE KEY UPDATE\n\t`field1`='1'\n", $sql);
141141
}
142142
}

‎tests/Builder/SelectTest.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
class SelectTestX extends \PHPUnit_Framework_TestCase {
88
public function testAddition() {
99
$str = TestSelect::create()->field('1+2')->asString();
10-
$this->assertEquals("SELECT\n\t1+2\n;\n", $str);
10+
$this->assertEquals("SELECT\n\t1+2\n", $str);
1111
}
1212

1313
public function testFrom() {
1414
$str = TestSelect::create()
1515
->field('a')
1616
->from('t', 'test')
1717
->asString();
18-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\n;\n", $str);
18+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\n", $str);
1919
}
2020

2121
public function testMultipleFrom() {
@@ -24,7 +24,7 @@ public function testMultipleFrom() {
2424
->from('t1', 'test1')
2525
->from('t2', 'test2')
2626
->asString();
27-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest1 t1,\n\ttest2 t2\n;\n", $str);
27+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest1 t1,\n\ttest2 t2\n", $str);
2828
}
2929

3030
public function testJoins() {
@@ -34,14 +34,14 @@ public function testJoins() {
3434
->from('t1', 'test1')
3535
->{$method}('t2', 'test2', 't2.id=t1.id')
3636
->asString();
37-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest1 t1\n{$type} JOIN\n\ttest2 t2 ON t2.id=t1.id\n;\n", $sql);
37+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest1 t1\n{$type} JOIN\n\ttest2 t2 ON t2.id=t1.id\n", $sql);
3838

3939
$sql = TestSelect::create()
4040
->field('a')
4141
->from('t1', 'test1')
4242
->{$method}('t2', 'test2', 't2.id=t1.id AND t2.id < ?', 1000)
4343
->asString();
44-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest1 t1\n{$type} JOIN\n\ttest2 t2 ON t2.id=t1.id AND t2.id < '1000'\n;\n", $sql);
44+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest1 t1\n{$type} JOIN\n\ttest2 t2 ON t2.id=t1.id AND t2.id < '1000'\n", $sql);
4545
};
4646

4747
$testFn('joinInner', 'INNER');
@@ -55,21 +55,21 @@ public function testWhere() {
5555
->from('t', 'test')
5656
->where('a+1<2')
5757
->asString();
58-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(a+1<2)\n;\n", $str);
58+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(a+1<2)\n", $str);
5959

6060
$str = TestSelect::create()
6161
->field('a')
6262
->from('t', 'test')
6363
->where('a < ?', 1000)
6464
->asString();
65-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(a < '1000')\n;\n", $str);
65+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(a < '1000')\n", $str);
6666

6767
$str = TestSelect::create()
6868
->field('a')
6969
->from('t', 'test')
7070
->where('a < :0', 1000)
7171
->asString();
72-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(a < '1000')\n;\n", $str);
72+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(a < '1000')\n", $str);
7373
}
7474

7575
public function testHaving() {
@@ -78,7 +78,7 @@ public function testHaving() {
7878
->from('t', 'test')
7979
->having('a+1<2')
8080
->asString();
81-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nHAVING\n\t(a+1<2)\n;\n", $str);
81+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nHAVING\n\t(a+1<2)\n", $str);
8282
}
8383

8484
public function testOrder() {
@@ -87,7 +87,7 @@ public function testOrder() {
8787
->from('t', 'test')
8888
->orderBy('a', 'desc')
8989
->asString();
90-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nORDER BY\n\ta DESC\n;\n", $str);
90+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nORDER BY\n\ta DESC\n", $str);
9191
}
9292

9393
public function testGroup() {
@@ -96,7 +96,7 @@ public function testGroup() {
9696
->from('t', 'test')
9797
->groupBy('a', 'b', 'c')
9898
->asString();
99-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nGROUP BY\n\ta,\n\tb,\n\tc\n;\n", $str);
99+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nGROUP BY\n\ta,\n\tb,\n\tc\n", $str);
100100
}
101101

102102
public function testLimit() {
@@ -105,7 +105,7 @@ public function testLimit() {
105105
->from('t', 'test')
106106
->limit(100)
107107
->asString();
108-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nLIMIT\n\t100\n;\n", $str);
108+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nLIMIT\n\t100\n", $str);
109109
}
110110

111111
public function testOffset() {
@@ -115,7 +115,7 @@ public function testOffset() {
115115
->limit(100)
116116
->offset(50)
117117
->asString();
118-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nLIMIT\n\t100\nOFFSET\n\t50\n;\n", $str);
118+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nLIMIT\n\t100\nOFFSET\n\t50\n", $str);
119119
}
120120

121121
public function testForUpdate() {
@@ -124,7 +124,7 @@ public function testForUpdate() {
124124
->from('t', 'test')
125125
->forUpdate()
126126
->asString();
127-
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nFOR UPDATE\n;\n", $str);
127+
$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nFOR UPDATE\n", $str);
128128
}
129129

130130
public function testInnerSelect() {
@@ -136,15 +136,15 @@ public function testInnerSelect() {
136136
->from('t', $select)
137137
->asString();
138138

139-
$this->assertEquals("SELECT\n\t*\nFROM\n\t(SELECT\n\t\t*\n\tFROM\n\t\ttable a\n\tWHERE\n\t\t(a.id=1)) t\n;\n", $str);
139+
$this->assertEquals("SELECT\n\t*\nFROM\n\t(SELECT\n\t\t*\n\tFROM\n\t\ttable a\n\tWHERE\n\t\t(a.id=1)) t\n", $str);
140140
}
141141

142142
public function testAlias() {
143143
$query = TestSelect::create()
144144
->from('t', 'travis#test1')
145145
->asString();
146146

147-
$this->assertEquals("SELECT\n\t*\nFROM\n\ttravis_test.test1 t\n;\n", $query);
147+
$this->assertEquals("SELECT\n\t*\nFROM\n\ttravis_test.test1 t\n", $query);
148148
}
149149

150150
public function testCount() {
@@ -155,7 +155,7 @@ public function testCount() {
155155
->where('t1.id > 10')
156156
->asString();
157157

158-
$this->assertEquals("SELECT\n\tCOUNT(*)\nFROM\n\ttest1 t1\nINNER JOIN\n\ttest2 t2 ON t1.id=t2.id\nWHERE\n\t(t1.id > 10)\n;\n", $query);
158+
$this->assertEquals("SELECT\n\tCOUNT(*)\nFROM\n\ttest1 t1\nINNER JOIN\n\ttest2 t2 ON t1.id=t2.id\nWHERE\n\t(t1.id > 10)\n", $query);
159159
}
160160

161161
public function testSubselectAsField() {
@@ -172,6 +172,6 @@ public function testSubselectAsField() {
172172
->where('t1.id > 10')
173173
->asString();
174174

175-
$this->assertEquals("SELECT\n\t(\n\t\tSELECT\n\t\t\tCOUNT(*)\n\t\tFROM\n\t\t\ttest1 t1\n\t\tINNER JOIN\n\t\t\ttest2 t2 ON t1.id=t2.id\n\t\tWHERE\n\t\t\t(t1.id > 10)\n\t) AS `testfield`\nFROM\n\ttest1 t1\nINNER JOIN\n\ttest2 t2 ON t1.id=t2.id\nWHERE\n\t(t1.id > 10)\n;\n", $query);
175+
$this->assertEquals("SELECT\n\t(\n\t\tSELECT\n\t\t\tCOUNT(*)\n\t\tFROM\n\t\t\ttest1 t1\n\t\tINNER JOIN\n\t\t\ttest2 t2 ON t1.id=t2.id\n\t\tWHERE\n\t\t\t(t1.id > 10)\n\t) AS `testfield`\nFROM\n\ttest1 t1\nINNER JOIN\n\ttest2 t2 ON t1.id=t2.id\nWHERE\n\t(t1.id > 10)\n", $query);
176176
}
177177
}

0 commit comments

Comments
 (0)