@@ -48,10 +48,11 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | public function getRan() |
| 50 | 50 | { |
| 51 | - $qb = AQB::for('m', 'migrations') |
|
| 52 | - ->sort(['m.batch', 'm.migrations']) |
|
| 51 | + $qb = AQB::for('m', 'migrations') { |
|
| 52 | + ->sort(['m.batch', 'm.migrations']) |
|
| 53 | 53 | ->return('m.migration') |
| 54 | 54 | ->get(); |
| 55 | + } |
|
| 55 | 56 | |
| 56 | 57 | |
| 57 | 58 | return $this->getConnection()->select($qb->query); |
@@ -72,12 +73,13 @@ discard block |
||
| 72 | 73 | { |
| 73 | 74 | $bindings['steps'] = $steps; |
| 74 | 75 | |
| 75 | - $qb = AQB::for('m', 'migrations') |
|
| 76 | - ->filter('m.batch', '>=', 1) |
|
| 76 | + $qb = AQB::for('m', 'migrations') { |
|
| 77 | + ->filter('m.batch', '>=', 1) |
|
| 77 | 78 | ->sort([['m.batch', 'DESC'], ['m.migration', 'DESC']]) |
| 78 | 79 | ->limit($steps) |
| 79 | 80 | ->return(['migration' => 'm.migration', 'batch' => 'm.batch']) |
| 80 | 81 | ->get(); |
| 82 | + } |
|
| 81 | 83 | |
| 82 | 84 | return $this->getConnection()->select($qb->query); |
| 83 | 85 | |
@@ -87,11 +89,12 @@ discard block |
||
| 87 | 89 | { |
| 88 | 90 | $batch = $this->getLastBatchNumber(); |
| 89 | 91 | |
| 90 | - $qb = AQB::for('m', 'migrations') |
|
| 91 | - ->filter('m.batch', $batch) |
|
| 92 | + $qb = AQB::for('m', 'migrations') { |
|
| 93 | + ->filter('m.batch', $batch) |
|
| 92 | 94 | ->sort('m.migration', 'desc') |
| 93 | 95 | ->return('m') |
| 94 | 96 | ->get(); |
| 97 | + } |
|
| 95 | 98 | |
| 96 | 99 | return $this->getConnection()->select($qb->query); |
| 97 | 100 | |
@@ -107,10 +110,11 @@ discard block |
||
| 107 | 110 | */ |
| 108 | 111 | public function getMigrationBatches() |
| 109 | 112 | { |
| 110 | - $qb = AQB::for('m', 'migrations') |
|
| 111 | - ->sort([['m.batch'], ['m.migration']]) |
|
| 113 | + $qb = AQB::for('m', 'migrations') { |
|
| 114 | + ->sort([['m.batch'], ['m.migration']]) |
|
| 112 | 115 | ->return(['batch' => 'm.batch', 'migration' => 'm.migration']) |
| 113 | 116 | ->get(); |
| 117 | + } |
|
| 114 | 118 | |
| 115 | 119 | return $this->getConnection()->select($qb->query); |
| 116 | 120 | |
@@ -145,10 +149,11 @@ discard block |
||
| 145 | 149 | */ |
| 146 | 150 | public function delete($migration) |
| 147 | 151 | { |
| 148 | - $qb = AQB::for('m', 'migrations') |
|
| 149 | - ->filter('m.migration', $migration->migration) |
|
| 152 | + $qb = AQB::for('m', 'migrations') { |
|
| 153 | + ->filter('m.migration', $migration->migration) |
|
| 150 | 154 | ->remove('m', 'migrations') |
| 151 | 155 | ->get(); |
| 156 | + } |
|
| 152 | 157 | |
| 153 | 158 | $this->getConnection()->delete($qb->query, $qb->binds); |
| 154 | 159 | |
@@ -35,11 +35,12 @@ discard block |
||
| 35 | 35 | $filter[] = ['doc.'.$attribute, '!=', 'null']; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - $qb = AQB::for('doc', $collection) |
|
| 39 | - ->filter($filter) |
|
| 38 | + $qb = AQB::for('doc', $collection) { |
|
| 39 | + ->filter($filter) |
|
| 40 | 40 | ->limit(1) |
| 41 | 41 | ->return('true') |
| 42 | 42 | ->get(); |
| 43 | + } |
|
| 43 | 44 | |
| 44 | 45 | $command->aqb = $qb; |
| 45 | 46 | |
@@ -65,8 +66,8 @@ discard block |
||
| 65 | 66 | ['doc.'.$command->to], |
| 66 | 67 | ]; |
| 67 | 68 | |
| 68 | - $qb = AQB::for('doc', $collection) |
|
| 69 | - ->filter($filter) |
|
| 69 | + $qb = AQB::for('doc', $collection) { |
|
| 70 | + ->filter($filter) |
|
| 70 | 71 | ->update( |
| 71 | 72 | 'doc', |
| 72 | 73 | [ |
@@ -76,6 +77,7 @@ discard block |
||
| 76 | 77 | $collection) |
| 77 | 78 | ->options( ['keepNull' => true]) |
| 78 | 79 | ->get(); |
| 80 | + } |
|
| 79 | 81 | |
| 80 | 82 | $command->aqb = $qb; |
| 81 | 83 | |
@@ -101,11 +103,12 @@ discard block |
||
| 101 | 103 | $filter[] = ['doc.'.$attribute, '!=', 'null', 'OR']; |
| 102 | 104 | $data[$attribute] = 'null'; |
| 103 | 105 | } |
| 104 | - $qb = AQB::for('doc', $collection) |
|
| 105 | - ->filter($filter ) |
|
| 106 | + $qb = AQB::for('doc', $collection) { |
|
| 107 | + ->filter($filter ) |
|
| 106 | 108 | ->update('doc', $data, $collection) |
| 107 | 109 | ->options(['keepNull' => false]) |
| 108 | 110 | ->get(); |
| 111 | + } |
|
| 109 | 112 | |
| 110 | 113 | $command->aqb = $qb; |
| 111 | 114 | |
@@ -162,7 +162,7 @@ |
||
| 162 | 162 | */ |
| 163 | 163 | protected function compileFrom(\Illuminate\Database\Query\Builder $query, FluentAQL $aqb, $table) |
| 164 | 164 | { |
| 165 | - return $aqb->for($this->generateVariable($table), $this->prefixTable($table)); |
|
| 165 | + return $aqb->for($this->generateVariable($table), $this->prefixTable($table)); |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | /** |