Skip to content

Commit 3f56cc5

Browse files
kenjiskenjis
committed
refactor: replace $data with $field
1 parent a33ff9c commit 3f56cc5

4 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎system/Database/Forge.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -846,10 +846,10 @@ protected function _alterTable(string $alterType, string $table, $processedField
846846

847847
$sqls = [];
848848

849-
foreach ($processedFields as $data) {
850-
$sqls[] = $sql . ($data['_literal'] !== false
851-
? $data['_literal']
852-
: $this->_processColumn($data));
849+
foreach ($processedFields as $field) {
850+
$sqls[] = $sql . ($field['_literal'] !== false
851+
? $field['_literal']
852+
: $this->_processColumn($field));
853853
}
854854

855855
return $sqls;

‎system/Database/MySQLi/Forge.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ protected function _alterTable(string $alterType, string $table, $processedField
144144

145145
$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
146146

147-
foreach ($processedFields as $i => $data) {
148-
if ($data['_literal'] !== false) {
149-
$processedFields[$i] = ($alterType === 'ADD') ? "\n\tADD " . $data['_literal'] : "\n\tMODIFY " . $data['_literal'];
147+
foreach ($processedFields as $i => $field) {
148+
if ($field['_literal'] !== false) {
149+
$processedFields[$i] = ($alterType === 'ADD') ? "\n\tADD " . $field['_literal'] : "\n\tMODIFY " . $field['_literal'];
150150
} else {
151151
if ($alterType === 'ADD') {
152152
$processedFields[$i]['_literal'] = "\n\tADD ";
153153
} else {
154-
$processedFields[$i]['_literal'] = empty($data['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
154+
$processedFields[$i]['_literal'] = empty($field['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
155155
}
156156

157157
$processedFields[$i] = $processedFields[$i]['_literal'] . $this->_processColumn($processedFields[$i]);

‎system/Database/Postgre/Forge.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,37 +96,37 @@ protected function _alterTable(string $alterType, string $table, $processedField
9696
$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
9797
$sqls = [];
9898

99-
foreach ($processedFields as $data) {
100-
if ($data['_literal'] !== false) {
99+
foreach ($processedFields as $field) {
100+
if ($field['_literal'] !== false) {
101101
return false;
102102
}
103103

104-
if (version_compare($this->db->getVersion(), '8', '>=') && isset($data['type'])) {
105-
$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
106-
. " TYPE {$data['type']}{$data['length']}";
104+
if (version_compare($this->db->getVersion(), '8', '>=') && isset($field['type'])) {
105+
$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($field['name'])
106+
. " TYPE {$field['type']}{$field['length']}";
107107
}
108108

109-
if (! empty($data['default'])) {
110-
$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
111-
. " SET DEFAULT {$data['default']}";
109+
if (! empty($field['default'])) {
110+
$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($field['name'])
111+
. " SET DEFAULT {$field['default']}";
112112
}
113113

114114
$nullable = true; // Nullable by default.
115-
if (isset($data['null']) && ($data['null'] === false || $data['null'] === ' NOT ' . $this->null)) {
115+
if (isset($field['null']) && ($field['null'] === false || $field['null'] === ' NOT ' . $this->null)) {
116116
$nullable = false;
117117
}
118-
$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
118+
$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($field['name'])
119119
. ($nullable === true ? ' DROP' : ' SET') . ' NOT NULL';
120120

121-
if (! empty($data['new_name'])) {
122-
$sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($data['name'])
123-
. ' TO ' . $this->db->escapeIdentifiers($data['new_name']);
121+
if (! empty($field['new_name'])) {
122+
$sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($field['name'])
123+
. ' TO ' . $this->db->escapeIdentifiers($field['new_name']);
124124
}
125125

126-
if (! empty($data['comment'])) {
126+
if (! empty($field['comment'])) {
127127
$sqls[] = 'COMMENT ON COLUMN' . $this->db->escapeIdentifiers($table)
128-
. '.' . $this->db->escapeIdentifiers($data['name'])
129-
. " IS {$data['comment']}";
128+
. '.' . $this->db->escapeIdentifiers($field['name'])
129+
. " IS {$field['comment']}";
130130
}
131131
}
132132

‎system/Database/SQLSRV/Forge.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -183,45 +183,45 @@ protected function _alterTable(string $alterType, string $table, $processedField
183183
$sqls = [];
184184

185185
if ($alterType === 'ADD') {
186-
foreach ($processedFields as $data) {
187-
$sqls[] = $sql . ($data['_literal'] !== false ? $data['_literal'] : $this->_processColumn($data));
186+
foreach ($processedFields as $field) {
187+
$sqls[] = $sql . ($field['_literal'] !== false ? $field['_literal'] : $this->_processColumn($field));
188188
}
189189

190190
return $sqls;
191191
}
192192

193-
foreach ($processedFields as $data) {
194-
if ($data['_literal'] !== false) {
193+
foreach ($processedFields as $field) {
194+
if ($field['_literal'] !== false) {
195195
return false;
196196
}
197197

198-
if (isset($data['type'])) {
199-
$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
200-
. " {$data['type']}{$data['length']}";
198+
if (isset($field['type'])) {
199+
$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($field['name'])
200+
. " {$field['type']}{$field['length']}";
201201
}
202202

203-
if (! empty($data['default'])) {
204-
$sqls[] = $sql . ' ALTER COLUMN ADD CONSTRAINT ' . $this->db->escapeIdentifiers($data['name']) . '_def'
205-
. " DEFAULT {$data['default']} FOR " . $this->db->escapeIdentifiers($data['name']);
203+
if (! empty($field['default'])) {
204+
$sqls[] = $sql . ' ALTER COLUMN ADD CONSTRAINT ' . $this->db->escapeIdentifiers($field['name']) . '_def'
205+
. " DEFAULT {$field['default']} FOR " . $this->db->escapeIdentifiers($field['name']);
206206
}
207207

208208
$nullable = true; // Nullable by default.
209-
if (isset($data['null']) && ($data['null'] === false || $data['null'] === ' NOT ' . $this->null)) {
209+
if (isset($field['null']) && ($field['null'] === false || $field['null'] === ' NOT ' . $this->null)) {
210210
$nullable = false;
211211
}
212-
$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
213-
. " {$data['type']}{$data['length']} " . ($nullable === true ? '' : 'NOT') . ' NULL';
212+
$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($field['name'])
213+
. " {$field['type']}{$field['length']} " . ($nullable === true ? '' : 'NOT') . ' NULL';
214214

215-
if (! empty($data['comment'])) {
215+
if (! empty($field['comment'])) {
216216
$sqls[] = 'EXEC sys.sp_addextendedproperty '
217-
. "@name=N'Caption', @value=N'" . $data['comment'] . "' , "
217+
. "@name=N'Caption', @value=N'" . $field['comment'] . "' , "
218218
. "@level0type=N'SCHEMA',@level0name=N'" . $this->db->schema . "', "
219219
. "@level1type=N'TABLE',@level1name=N'" . $this->db->escapeIdentifiers($table) . "', "
220-
. "@level2type=N'COLUMN',@level2name=N'" . $this->db->escapeIdentifiers($data['name']) . "'";
220+
. "@level2type=N'COLUMN',@level2name=N'" . $this->db->escapeIdentifiers($field['name']) . "'";
221221
}
222222

223-
if (! empty($data['new_name'])) {
224-
$sqls[] = "EXEC sp_rename '[" . $this->db->schema . '].[' . $table . '].[' . $data['name'] . "]' , '" . $data['new_name'] . "', 'COLUMN';";
223+
if (! empty($field['new_name'])) {
224+
$sqls[] = "EXEC sp_rename '[" . $this->db->schema . '].[' . $table . '].[' . $field['name'] . "]' , '" . $field['new_name'] . "', 'COLUMN';";
225225
}
226226
}
227227

0 commit comments

Comments
 (0)