diff --git a/.gitignore b/.gitignore index bf20b57..c7ab38e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /.env -/bin/bisous.phar +/build/bisous.phar +/build/bisous.phar.pubkey /bisous-phar-private.pem /bisous-phar-private-nopassphrase.pem -/bin/bisous.phar.pubkey diff --git a/box.json.dist b/box.json.dist index 7f703e0..f2ccaf0 100644 --- a/box.json.dist +++ b/box.json.dist @@ -1,7 +1,7 @@ { "chmod": "0755", "main": "bin/bisous", - "output": "bin/bisous.phar", + "output": "build/bisous.phar", "directories": ["src"], "finder": [ { diff --git a/src/App/Resources/templates/product/04-consolidate-product-models.sql.twig b/src/App/Resources/templates/product/04-consolidate-product-models.sql.twig index d35f74e..08d0511 100644 --- a/src/App/Resources/templates/product/04-consolidate-product-models.sql.twig +++ b/src/App/Resources/templates/product/04-consolidate-product-models.sql.twig @@ -6,7 +6,6 @@ SELECT {% endfor %} {% endfor %} hierarchy.parent AS code, - hierarchy.family AS family, hierarchy.family_variant AS family_variant, NULL AS parent FROM tmp_sku AS product @@ -33,7 +32,6 @@ SELECT {% endfor %} {% endfor %} hierarchy.child AS code, - hierarchy.family AS family, hierarchy.family_variant AS family_variant, hierarchy.parent AS parent FROM tmp_sku AS product