more fixup

loadsys · Jun 14, 2016 · 25f530d · 25f530d
1 parent d2e0213
commit 25f530d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/src/Template/Bake/Element/add-foreign-keys-from-create.ctp b/src/Template/Bake/Element/add-foreign-keys-from-create.ctp
@@ -1,3 +1,3 @@
 <% foreach ($constraints as $table => $tableConstraints):
-	echo $this->element('Migrations.add-foreign-keys', ['constraints' => $tableConstraints, 'table' => $table]);
+	echo $this->element('LoadsysTheme.add-foreign-keys', ['constraints' => $tableConstraints, 'table' => $table]);
 endforeach; %>
diff --git a/src/Template/Bake/Element/create-tables.ctp b/src/Template/Bake/Element/create-tables.ctp
@@ -9,10 +9,10 @@ $specialPk = (count($primaryKeys) > 1 || $primaryKeys[0]['name'] !== 'id' || $pr
 %>
 <% if ($specialPk): %>
 
-		$this->table('<%= $tableArgForArray %>', ['id' => false, 'primary_key' => ['<%= implode("', '", \Cake\Utility\Hash::extract($primaryKeys, '{n}.name')) %>']])
+		$this->table('<%= $tableArgForArray %>', ['id' => false, 'primary_key' => ['<%= implode("', '", \Cake\Utility\Hash::extract($primaryKeys, '{n}.name')) %>'], ['comment' => '']])
 <% else: %>
 
-		$this->table('<%= $tableArgForArray %>')
+		$this->table('<%= $tableArgForArray %>', ['comment' => ''])
 <% endif; %>
 <% if ($specialPk || !$autoId):
 	foreach ($primaryKeys as $primaryKey) :
@@ -30,7 +30,8 @@ foreach ($this->Migration->columns($tableArgForMethods) as $column => $config):
 %>
 			->addColumn('<%= $column %>', '<%= $config['columnType'] %>', [<%
 			$columnOptions = $this->Migration->getColumnOption($config['options']);
-			$columnOptions['comment'] = '@' . 'TO' . 'DO';
+			$columnOptions['comment'] = '';
+			//@TODO: init proper integrity checks matching MigrationsTest from skeleton. (Example: int id must be signed=false)
 			if ($config['columnType'] === 'boolean' && isset($columnOptions['default']) && $this->Migration->value($columnOptions['default']) !== 'null'):
 				$columnOptions['default'] = (bool)$columnOptions['default'];
 			endif;
@@ -77,5 +78,5 @@ endforeach; %>
 			->create();
 <% endforeach; %>
 <% if (!empty($constraints)): %>
-<% echo $this->element('Migrations.add-foreign-keys-from-create', ['constraints' => $constraints]); %>
+<% echo $this->element('LoadsysTheme.add-foreign-keys-from-create', ['constraints' => $constraints]); %>
 <% endif; %>
diff --git a/src/Template/Bake/config/diff.ctp b/src/Template/Bake/config/diff.ctp
@@ -104,7 +104,7 @@ class <%= $name %> extends AbstractMigration {
         <%- endif; %>
         <%- endforeach; %>
         <%- if (!empty($tables['add'])): %>
-                <%- echo $this->element('Migrations.create-tables', ['tables' => $tables['add'], 'autoId' => $autoId, 'useSchema' => true]) %>
+                <%- echo $this->element('LoadsysTheme.create-tables', ['tables' => $tables['add'], 'autoId' => $autoId, 'useSchema' => true]) %>
         <%- endif; %>
         <%- foreach ($data as $tableName => $tableDiff): %>
             <%- if (!empty($tableDiff['columns']['add'])):
@@ -113,14 +113,14 @@ class <%= $name %> extends AbstractMigration {
 
         <%= $statement %>
             <%- endif; %>
-            <%- echo $this->element('Migrations.add-columns', ['columns' => $tableDiff['columns']['add']]) %>
+            <%- echo $this->element('LoadsysTheme.add-columns', ['columns' => $tableDiff['columns']['add']]) %>
             <%- endif; %>
             <%- if (!empty($tableDiff['indexes']['add'])):
             $statement = $this->Migration->tableStatement($tableName);
             if (!empty($statement)): %>
         <%= $statement %>
             <%- endif; %>
-            <%- echo $this->element('Migrations.add-indexes', ['indexes' => $tableDiff['indexes']['add']]) %>
+            <%- echo $this->element('LoadsysTheme.add-indexes', ['indexes' => $tableDiff['indexes']['add']]) %>
             <%- endif;
             if (isset($this->Migration->tableStatements[$tableName])): %>
             ->update();
@@ -170,7 +170,7 @@ class <%= $name %> extends AbstractMigration {
             <%- endforeach; %>
         <%- endif; %>
         <%- if (!empty($tables['remove'])): %>
-            <%- echo $this->element('Migrations.create-tables', ['tables' => $tables['remove'], 'autoId' => $autoId, 'useSchema' => true]) %>
+            <%- echo $this->element('LoadsysTheme.create-tables', ['tables' => $tables['remove'], 'autoId' => $autoId, 'useSchema' => true]) %>
         <%- endif; %>
         <%- foreach ($data as $tableName => $tableDiff): %>
             <%- if (!empty($tableDiff['indexes']['add'])): %>
@@ -190,7 +190,7 @@ class <%= $name %> extends AbstractMigration {
         <%= $this->Migration->tableStatement($tableName, true) %>
         <%- endif; %>
         <%- if (!empty($tableDiff['columns']['remove'])): %>
-        <%- echo $this->element('Migrations.add-columns', ['columns' => $tableDiff['columns']['remove']]) %>
+        <%- echo $this->element('LoadsysTheme.add-columns', ['columns' => $tableDiff['columns']['remove']]) %>
         <%- endif; %>
         <%- if (!empty($tableDiff['columns']['changed'])):
             $oldTableDef = $dumpSchema[$tableName];
@@ -213,7 +213,7 @@ class <%= $name %> extends AbstractMigration {
             <%- endforeach; %>
         <%- endif; %>
             <%- if (!empty($tableDiff['indexes']['remove'])): %>
-            <%- echo $this->element('Migrations.add-indexes', ['indexes' => $tableDiff['indexes']['remove']]) %>
+            <%- echo $this->element('LoadsysTheme.add-indexes', ['indexes' => $tableDiff['indexes']['remove']]) %>
             <%- endif;
             if (isset($this->Migration->tableStatements[$tableName])): %>
             ->update();

diff --git a/src/Template/Bake/config/skeleton.ctp b/src/Template/Bake/config/skeleton.ctp
@@ -47,7 +47,7 @@ class <%= $name %> extends AbstractMigration {
 	 */
 	public function change() {
 <% foreach ($tables as $table): %>
-		$table = $this->table('<%= $table%>');
+		$table = $this->table('<%= $table%>', ['comment' => '']);
 <% if ($tableMethod !== 'drop') : %>
 <% if ($columnMethod === 'removeColumn'): %>
 <% foreach ($columns['fields'] as $column => $config): %>
@@ -61,7 +61,7 @@ class <%= $name %> extends AbstractMigration {
 		$table-><%= $columnMethod %>('<%= $column %>', '<%= $config['columnType'] %>', [<%
 				$columnOptions = $config['options'];
 				$columnOptions = array_intersect_key($columnOptions, $wantedOptions);
-				$columnOptions['comment'] = '@' . 'TO' . 'DO';
+				$columnOptions['comment'] = '';
 				echo $this->Bake->stringifyList($columnOptions, ['indent' => 3]);
 			%>]);
 <% endforeach; %>

diff --git a/src/Template/Bake/config/snapshot.ctp b/src/Template/Bake/config/snapshot.ctp
@@ -52,7 +52,7 @@ class <%= $name %> extends AbstractMigration {
 	 * @return void
 	 */
 	public function up() {
-		<%- echo $this->element('Migrations.create-tables', ['tables' => $tables, 'autoId' => $autoId, 'useSchema' => false]) %>
+		<%- echo $this->element('LoadsysTheme.create-tables', ['tables' => $tables, 'autoId' => $autoId, 'useSchema' => false]) %>
 	}
 
 	/**