@scandipwa/magento-scripts 2.0.0-alpha.0 → 2.0.0-alpha.3

package/lib/tasks/magento/setup-magento/delete-customers.js

@@ -1,4 +1,4 @@
-const { customerTables } = require('../../mysql/magento-tables');
+const { customerTables } = require('../../database/magento-tables');
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
@@ -6,19 +6,19 @@ const { customerTables } = require('../../mysql/magento-tables');
 const deleteCustomers = () => ({
     title: 'Deleting customers',
     task: async (ctx, task) => {
-        const { mysqlConnection, withCustomersData } = ctx;
+        const { databaseConnection, withCustomersData } = ctx;
 
         if (withCustomersData) {
             task.skip();
             return;
         }
 
-        const [rows] = await mysqlConnection.query('select TABLE_NAME from information_schema.TABLES;');
+        const [rows] = await databaseConnection.query('select TABLE_NAME from information_schema.TABLES;');
 
         await Promise.all(
             customerTables
                 .filter((tableName) => rows.some((row) => row.TABLE_NAME === tableName))
-                .map((tableName) => mysqlConnection.query(`TRUNCATE TABLE \`${ tableName }\`;`))
+                .map((tableName) => databaseConnection.query(`TRUNCATE TABLE \`${ tableName }\`;`))
         );
     }
 });

package/lib/tasks/magento/setup-magento/delete-orders.js

@@ -1,4 +1,4 @@
-const { orderTables } = require('../../mysql/magento-tables');
+const { orderTables } = require('../../database/magento-tables');
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
@@ -6,19 +6,19 @@ const { orderTables } = require('../../mysql/magento-tables');
 const deleteOrders = () => ({
     title: 'Deleting orders',
     task: async (ctx, task) => {
-        const { mysqlConnection, withCustomersData } = ctx;
+        const { databaseConnection, withCustomersData } = ctx;
 
         if (withCustomersData) {
             task.skip();
             return;
         }
 
-        const [rows] = await mysqlConnection.query('select TABLE_NAME from information_schema.TABLES;');
+        const [rows] = await databaseConnection.query('select TABLE_NAME from information_schema.TABLES;');
 
         await Promise.all(
             orderTables
                 .filter((tableName) => rows.some((row) => row.TABLE_NAME === tableName))
-                .map((tableName) => mysqlConnection.query(`TRUNCATE TABLE \`${ tableName }\`;`))
+                .map((tableName) => databaseConnection.query(`TRUNCATE TABLE \`${ tableName }\`;`))
         );
     }
 });

package/lib/tasks/magento/setup-magento/increase-admin-session-lifetime.js

@@ -5,7 +5,7 @@ const { updateTableValues } = require('../../../util/database');
  */
 const increaseAdminSessionLifetime = () => ({
     title: 'Increase admin session lifetime to 1 month',
-    task: async ({ mysqlConnection }, task) => updateTableValues('core_config_data', [
+    task: async ({ databaseConnection }, task) => updateTableValues('core_config_data', [
         {
             path: 'admin/security/session_lifetime',
             value: '2800000'
@@ -15,7 +15,7 @@ const increaseAdminSessionLifetime = () => ({
             value: null
         }
     ], {
-        mysqlConnection,
+        databaseConnection,
         task
     })
 

package/lib/tasks/magento/setup-magento/index.js

@@ -11,6 +11,7 @@ const increaseAdminSessionLifetime = require('./increase-admin-session-lifetime'
 const magentoTask = require('../../../util/magento-task');
 const urnHighlighter = require('./urn-highlighter');
 const adjustFullPageCache = require('./adjust-full-page-cache');
+const updateEnvPHP = require('../../php/update-env-php');
 
 /**
  * @param {Object} [options]
@@ -32,6 +33,7 @@ const setupMagento = (options = {}) => ({
         return task.newListr([
             flushRedisConfig(),
             waitingForRedis(),
+            updateEnvPHP(),
             migrateDatabase(),
             {
                 title: 'Configuring Magento settings',

package/lib/tasks/magento/setup-magento/install-magento.js

@@ -24,19 +24,19 @@ const installMagento = ({ isDbEmpty = false } = {}) => ({
                 magentoConfiguration
             },
             ports,
-            mysqlConnection
+            databaseConnection
         } = ctx;
 
         const isLinux = ctx.platform === 'linux';
         const isNativeLinux = isLinux && !ctx.isWsl;
         const hostMachine = isNativeLinux ? '127.0.0.1' : 'host.docker.internal';
 
-        const [tableResponse] = await mysqlConnection.query(
+        const [tableResponse] = await databaseConnection.query(
             'SELECT * FROM information_schema.tables WHERE table_schema = \'magento\' AND table_name = \'admin_user\' LIMIT 1;'
         );
 
         if (tableResponse.length > 0) {
-            const response = await mysqlConnection.query(
+            const response = await databaseConnection.query(
                 'select * from admin_user where username=\'admin\';'
             );
 
@@ -58,23 +58,23 @@ const installMagento = ({ isDbEmpty = false } = {}) => ({
                     ]
                 });
 
-                await mysqlConnection.query('SET FOREIGN_KEY_CHECKS = 0;');
+                await databaseConnection.query('SET FOREIGN_KEY_CHECKS = 0;');
 
                 if (confirmDeleteAdminUsers === 'delete-all') {
-                    await mysqlConnection.query(`
+                    await databaseConnection.query(`
                     TRUNCATE TABLE admin_user;
                 `);
                 } else {
-                    await mysqlConnection.query(`
+                    await databaseConnection.query(`
                     DELETE FROM admin_user WHERE username='admin';
                 `);
                 }
 
-                await mysqlConnection.query('SET FOREIGN_KEY_CHECKS = 1;');
+                await databaseConnection.query('SET FOREIGN_KEY_CHECKS = 1;');
             }
         }
 
-        const { mysql: { env } } = docker.getContainers(ports);
+        const { mariadb: { env } } = docker.getContainers(ports);
         const envPhpData = await envPhpToJson(ctx);
 
         const envPhpHaveEncryptionKey = envPhpData && envPhpData.crypt && envPhpData.crypt.key && envPhpData.crypt.key;
@@ -126,10 +126,10 @@ const installMagento = ({ isDbEmpty = false } = {}) => ({
                 --cache-backend-redis-server='${ hostMachine }' \
                 --cache-backend-redis-port='${ ports.redis }' \
                 --cache-backend-redis-db='0't \
-                --db-host='${ hostMachine }:${ ports.mysql }' \
-                --db-name='${ env.MYSQL_DATABASE }' \
-                --db-user='${ env.MYSQL_USER }' \
-                --db-password='${ env.MYSQL_PASSWORD }' \
+                --db-host='${ hostMachine }:${ ports.mariadb }' \
+                --db-name='${ env.MARIADB_DATABASE }' \
+                --db-user='${ env.MARIADB_USER }' \
+                --db-password='${ env.MARIADB_PASSWORD }' \
                 --backend-frontname='${ magentoConfiguration.adminuri }' \
                 --no-interaction`;
 

package/lib/tasks/magento/setup-magento/migrate-database.js

@@ -8,6 +8,7 @@ const upgradeMagento = require('./upgrade-magento');
 const varnishConfigSetup = require('./varnish-config');
 const pathExists = require('../../../util/path-exists');
 const updateEnvPHP = require('../../php/update-env-php');
+const UnknownError = require('../../../errors/unknown-error');
 
 /**
  * @param {Object} [options]
@@ -17,9 +18,9 @@ const updateEnvPHP = require('../../php/update-env-php');
 const migrateDatabase = (options = {}) => ({
     title: 'Migrating database',
     task: async (ctx, task) => {
-        const { mysqlConnection } = ctx;
+        const { databaseConnection } = ctx;
 
-        const [[{ tableCount }]] = await mysqlConnection.query(`
+        const [[{ tableCount }]] = await databaseConnection.query(`
             SELECT count(*) AS tableCount
             FROM INFORMATION_SCHEMA.TABLES
             WHERE TABLE_SCHEMA = 'magento';
@@ -33,13 +34,11 @@ const migrateDatabase = (options = {}) => ({
             if (options.onlyInstallMagento) {
                 ctx.isSetupUpgradeNeeded = false;
                 return task.newListr([
-                    updateEnvPHP(),
                     installMagento({ isDbEmpty: true })
                 ]);
             }
 
             return task.newListr([
-                updateEnvPHP(),
                 installMagento({ isDbEmpty: true }),
                 updateEnvPHP(),
                 varnishConfigSetup(),
@@ -56,7 +55,7 @@ const migrateDatabase = (options = {}) => ({
             });
         }
 
-        const { code } = await runMagentoCommand(ctx, 'setup:db:status', {
+        const { code, result } = await runMagentoCommand(ctx, 'setup:db:status', {
             throwNonZeroCode: false
         });
 
@@ -65,7 +64,6 @@ const migrateDatabase = (options = {}) => ({
             ctx.isSetupUpgradeNeeded = false;
             // no setup is needed, but still to be sure configure ES
             return task.newListr([
-                updateEnvPHP(),
                 varnishConfigSetup(),
                 configureElasticsearch()
             ], {
@@ -88,7 +86,6 @@ const migrateDatabase = (options = {}) => ({
 
             return task.newListr([
                 installMagentoProject(),
-                updateEnvPHP(),
                 installMagento(),
                 updateEnvPHP(),
                 varnishConfigSetup(),
@@ -106,7 +103,6 @@ const migrateDatabase = (options = {}) => ({
         }
         case 2: {
             return task.newListr([
-                updateEnvPHP(),
                 varnishConfigSetup(),
                 configureElasticsearch(),
                 upgradeMagento()
@@ -120,9 +116,7 @@ const migrateDatabase = (options = {}) => ({
             });
         }
         default: {
-        // TODO: handle these statuses ?
-            task.title = 'Migrating database failed: manual action is required!';
-            break;
+            throw new UnknownError(`Migrating database failed: manual action is required!\n\n${result}`);
         }
         }
     },

package/lib/tasks/magento/setup-magento/set-base-url.js

@@ -14,7 +14,7 @@ module.exports = () => ({
                     ssl
                 }
             },
-            mysqlConnection
+            databaseConnection
         } = ctx;
         const isNgrok = host.endsWith('ngrok.io');
         const enableSecureFrontend = ssl.enabled ? '1' : '0';
@@ -29,6 +29,6 @@ module.exports = () => ({
             { path: 'web/secure/use_in_frontend', value: enableSecureFrontend },
             { path: 'web/secure/use_in_adminhtml', value: enableSecureFrontend },
             { path: 'web/cookie/cookie_domain', value: null }
-        ], { mysqlConnection, task });
+        ], { databaseConnection, task });
     }
 });

package/lib/tasks/magento/setup-magento/set-url-rewrite.js

@@ -5,13 +5,13 @@ const { updateTableValues } = require('../../../util/database');
  */
 const setUrlRewrite = () => ({
     title: 'Setting up url-rewrites',
-    task: async ({ mysqlConnection }, task) => {
+    task: async ({ databaseConnection }, task) => {
         await updateTableValues('core_config_data', [
             {
                 path: 'web/seo/use_rewrites',
                 value: '1'
             }
-        ], { mysqlConnection, task });
+        ], { databaseConnection, task });
     }
 });
 

package/lib/tasks/magento/setup-magento/varnish-config.js

@@ -18,7 +18,7 @@ const varnishConfigSetup = () => ({
                     }
                 }
             },
-            mysqlConnection,
+            databaseConnection,
             ports,
             debug
         } = ctx;
@@ -45,10 +45,10 @@ const varnishConfigSetup = () => ({
                     path: 'system/full_page_cache/caching_application',
                     value: '2'
                 }
-            ], { mysqlConnection, task });
+            ], { databaseConnection, task });
         } else {
             // delete varnish configuration if exists
-            await mysqlConnection.query(`
+            await databaseConnection.query(`
                 DELETE FROM core_config_data WHERE path LIKE '%varnish%';
             `);
 
@@ -59,7 +59,7 @@ const varnishConfigSetup = () => ({
                     path: 'system/full_page_cache/caching_application',
                     value: '0'
                 }
-            ], { mysqlConnection, task });
+            ], { databaseConnection, task });
         }
     },
     options: {

package/lib/tasks/php/update-env-php.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const os = require('os');
 const envPhpToJson = require('../../util/env-php-json');
 const getJsonfileData = require('../../util/get-jsonfile-data');
 const pathExists = require('../../util/path-exists');
@@ -48,8 +49,8 @@ const updateEnvPHP = () => ({
                 if (
                     persistedQueryConfig
                     && persistedQueryConfig.redis
-                    && persistedQueryConfig.redis.port === `${ ctx.ports.redis }`
-                    && persistedQueryConfig.redis.host === 'localhost'
+                    && (persistedQueryConfig.redis.port !== `${ ctx.ports.redis }`
+                    || persistedQueryConfig.redis.host === hostMachine)
                 ) {
                     SETUP_PQ = '';
                     return;
@@ -76,7 +77,8 @@ const updateEnvPHP = () => ({
             ],
             image: php.image,
             detach: false,
-            rm: true
+            rm: true,
+            user: isLinux ? `${os.userInfo().uid}:${os.userInfo().gid}` : ''
         });
 
         task.output = result;

package/lib/tasks/php/update-env.php

@@ -85,18 +85,12 @@ class EnvUpdater
             $hostMachine = '127.0.0.1';
         }
 
-        // update mysql config
+        // update mariadb config
         if (isset($this->config["db"]["connection"]["default"])) {
             $conn = &$this->config["db"]["connection"]["default"];
-            $mysqlHost = $hostMachine . ":" . $this->portConfig["mysql"];
-            if (
-                isset($conn["engine"]) &&
-                isset($conn["host"]) &&
-                $conn["engine"] === "innodb" &&
-                $conn["host"] !== $mysqlHost
-            ) {
-                $conn["host"] = $mysqlHost;
-            }
+            $mysqlHost = $hostMachine . ":" . $this->portConfig["mariadb"];
+
+            $conn["host"] = $mysqlHost;
         }
 
         // update redis session config
@@ -132,8 +126,14 @@ class EnvUpdater
             $cacheConfig = &$this->config["cache"];
             $redisPort = getenv("REDIS_PORT");
 
-            if (isset($cacheConfig) && isset($cacheConfig["persisted-query"]) && isset($cacheConfig["persisted-query"]["redis"]) && $cacheConfig["persisted-query"]["redis"]["port"] != $redisPort) {
-                $cacheConfig["persisted-query"]["redis"]["port"] = $redisPort;
+            if (isset($cacheConfig) && isset($cacheConfig["persisted-query"]) && isset($cacheConfig["persisted-query"]["redis"])) {
+                if ($cacheConfig["persisted-query"]["redis"]["port"] !== $redisPort) {
+                    $cacheConfig["persisted-query"]["redis"]["port"] = $redisPort;
+                }
+
+                if ($cacheConfig["persisted-query"]["redis"]["host"] !== $hostMachine) {
+                    $cacheConfig["persisted-query"]["redis"]["host"] = $hostMachine;
+                }
             } else {
                 if (!isset($cacheConfig)) {
                     $this->config["cache"] = [];

package/lib/tasks/start.js

@@ -12,13 +12,7 @@ const { installMagentoProject, setupMagento } = require('./magento');
 const { pullImages, stopContainers } = require('./docker/containers');
 const dockerNetwork = require('./docker/network');
 const { setPrefix } = require('./prefix');
-const {
-    connectToMySQL
-    // importDumpToMySQL,
-    // fixDB,
-    // restoreThemeConfig,
-    // dumpThemeConfig
-} = require('./mysql');
+const { connectToDatabase } = require('./database');
 const { buildProjectImage, buildDebugProjectImage } = require('./docker/project-image-builder');
 const getProjectConfiguration = require('../config/get-project-configuration');
 const { getSystemConfigTask } = require('../config/system-config');
@@ -32,7 +26,8 @@ const checkForXDGOpen = require('../util/xdg-open-exists');
 const { getInstanceMetadata, constants: { WEB_LOCATION_TITLE } } = require('../util/instance-metadata');
 const waitingForVarnish = require('./magento/setup-magento/waiting-for-varnish');
 const checkPHPVersion = require('./requirements/php-version');
-const volumes = require('./docker/volumes');
+const volumes = require('./docker/volume/tasks');
+const convertMySQLDatabaseToMariaDB = require('./docker/convert-mysql-to-mariadb');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -44,6 +39,7 @@ const retrieveProjectConfiguration = () => ({
         checkConfigurationFile(),
         getProjectConfiguration(),
         convertLegacyVolumes(),
+        convertMySQLDatabaseToMariaDB(),
         createCacheFolder(),
         getSystemConfigTask(),
         getCachedPorts()
@@ -114,7 +110,7 @@ const configureProject = () => ({
         installMagentoProject(),
         enableMagentoComposerPlugins(),
         startServices(),
-        connectToMySQL()
+        connectToDatabase()
     ])
 });
 
@@ -125,22 +121,6 @@ const finishProjectConfiguration = () => ({
     title: 'Finishing project configuration',
     skip: ({ skipSetup }) => skipSetup,
     task: (ctx, task) => task.newListr([
-        // {
-        //     skip: (ctx) => !ctx.importDb,
-        //     task: (ctx, task) => {
-        //         task.title = 'Importing database dump';
-        //         return task.newListr([
-        //             dumpThemeConfig(),
-        //             importDumpToMySQL(),
-        //             fixDB(),
-        //             restoreThemeConfig(),
-        //             setupMagento()
-        //         ], {
-        //             concurrent: false,
-        //             exitOnError: true
-        //         });
-        //     }
-        // },
         setupThemes(),
         waitingForVarnish()
     ], {

package/lib/tasks/status/index.js

@@ -73,8 +73,10 @@ const prettyStatus = async (ctx) => {
 
         if (container.status && container.status.Health) {
             containerStatus = `✓ ${ logger.style.file(container.status.Health.Status) } and ${ logger.style.file('running') }`;
-        } else {
+        } else if (container.status) {
             containerStatus = logger.style.file(container.status.Status);
+        } else {
+            containerStatus = '✖ Not running';
         }
 
         block
@@ -83,7 +85,7 @@ const prettyStatus = async (ctx) => {
             .addLine(`Image: ${logger.style.file(container.image)}`)
             .addLine(`Network: ${logger.style.link(container.network)}`);
 
-        if (container.forwardedPorts && container.forwardedPorts.length > 0) {
+        if (!containerStatus.includes('Not running') && container.forwardedPorts && container.forwardedPorts.length > 0) {
             block.addLine('Port forwarding:');
             container.forwardedPorts.forEach((port) => {
                 const { host, hostPort, containerPort } = parsePort(port);

package/lib/tasks/theme/link-theme.js

@@ -18,7 +18,7 @@ const linkTheme = () => ({
             absoluteThemePath,
             themePath,
             composerData,
-            mysqlConnection
+            databaseConnection
         } = ctx;
         const {
             magento: { edition: magentoEdition },
@@ -27,7 +27,7 @@ const linkTheme = () => ({
 
         const isEnterprise = magentoEdition === 'enterprise';
         const isPageBuilderInstalled = isEnterprise && semver.satisfies(semver.coerce(magentoVersion), '^2.4');
-        const [queryResult] = await mysqlConnection.query(`
+        const [queryResult] = await databaseConnection.query(`
                 SELECT value AS isPagebuilderEnabled
                 FROM core_config_data
                 WHERE path = 'cms/pagebuilder/enabled'

package/lib/util/config-file-validator.js

@@ -46,10 +46,16 @@ const sslSchema = Joi.object({
     ssl_certificate_key: Joi.string().required()
 });
 
+/**
+ * @type {Joi.ObjectSchema<import('../../typings/index').PHPExtensions>}
+ */
 const phpExtensionConfiguration = Joi.object()
     .pattern(
         Joi.string(),
         Joi.object({
+            alternativeName: Joi.array().items(Joi.string()).optional(),
+            command: Joi.func().optional(),
+            dependencies: Joi.array().items(Joi.string()).optional(),
             version: Joi.string().optional()
         })
             .unknown()
@@ -59,38 +65,47 @@ const phpExtensionConfiguration = Joi.object()
  * @type {Joi.ObjectSchema<import('../../typings').PHPConfiguration>}
  */
 const phpConfigurationSchema = Joi.object({
-    version: Joi.string().optional().custom(versionValidator),
+    baseImage: Joi.string().optional(),
+    debugImage: Joi.string().optional(),
+    fpmConfigTemplate: Joi.string().optional(),
     configTemplate: Joi.string().optional().custom(fileExistsValidator),
-    extensions: phpExtensionConfiguration.optional(),
-    disabledExtensions: Joi.array().items(Joi.string())
+    extensions: phpExtensionConfiguration.optional()
 });
 
 /**
  * @type {Joi.ObjectSchema<import('../../typings').NginxConfiguration>}
  */
 const nginxConfigurationSchema = Joi.object({
-    version: Joi.string().optional(),
+    image: Joi.string().optional(),
     configTemplate: Joi.string().optional().custom(fileExistsValidator)
 });
 
 /**
- * @type {Joi.ObjectSchema<import('../../typings').NginxConfiguration>}
+ * @type {Joi.ObjectSchema<import('../../typings').VarnishConfiguration>}
  */
 const varnishConfigurationSchema = Joi.object({
     enabled: Joi.boolean().optional(),
-    version: Joi.string().optional(),
+    image: Joi.string().optional(),
     configTemplate: Joi.string().optional().custom(fileExistsValidator)
 });
 
 /**
- * @type {Joi.ObjectSchema<import('../../typings').ServiceWithVersion>}
+ * @type {Joi.ObjectSchema<import('../../typings').ServiceWithImage>}
  */
 const serviceConfigurationSchema = Joi.object({
-    version: Joi.string().optional()
+    image: Joi.string().optional()
+});
+
+/**
+ * @type {Joi.ObjectSchema<import('../../typings').ElasticSearchConfiguration>}
+ */
+const elasticsearchConfigurationSchema = Joi.object({
+    image: Joi.string().optional(),
+    env: Joi.object().optional()
 });
 
 /**
- * @type {Joi.ObjectSchema<import('../../typings').CMAConfiguration['configuration']['composer']>}
+ * @type {Joi.ObjectSchema<import('../../typings').ComposerConfiguration>}
  */
 const composerConfigurationSchema = Joi.object({
     version: Joi.string().optional().custom((value) => {
@@ -108,8 +123,8 @@ const composerConfigurationSchema = Joi.object({
 const configurationSchema = Joi.object({
     php: phpConfigurationSchema.optional(),
     nginx: nginxConfigurationSchema.optional(),
-    mysql: serviceConfigurationSchema.optional(),
-    elasticsearch: serviceConfigurationSchema.optional(),
+    mariadb: serviceConfigurationSchema.optional(),
+    elasticsearch: elasticsearchConfigurationSchema.optional(),
     redis: serviceConfigurationSchema.optional(),
     composer: composerConfigurationSchema.optional(),
     varnish: varnishConfigurationSchema.optional(),
@@ -124,8 +139,7 @@ const configFileSchema = Joi.object({
     host: Joi.string().optional(),
     ssl: sslSchema.optional(),
     prefix: Joi.bool().optional(),
-    configuration: configurationSchema.required(),
-    useNonOverlappingPorts: Joi.bool().forbidden()
+    configuration: configurationSchema.required()
 });
 
 /**

package/lib/util/database.js

@@ -4,8 +4,8 @@
  * @param {{path: string, value: string}[]} values
  * @param {import('../../typings/context').ListrContext} param1
  */
-const updateTableValues = async (table, values, { mysqlConnection, task }) => {
-    const [rows] = await mysqlConnection.query(`
+const updateTableValues = async (table, values, { databaseConnection, task }) => {
+    const [rows] = await databaseConnection.query(`
         SELECT * FROM ${table}
         WHERE ${values.map((p) => `path = '${p.path}'`).join(' OR ')};
     `);
@@ -13,7 +13,7 @@ const updateTableValues = async (table, values, { mysqlConnection, task }) => {
     if (rows.filter(Boolean).length !== values.length) {
         const lostConfigs = values.filter((p) => !rows.some((row) => row.path === p.path));
         for (const config of lostConfigs) {
-            await mysqlConnection.query(`
+            await databaseConnection.query(`
                 INSERT INTO ${table}
                 (scope, path, value)
                 VALUES ('default', ?, ?);
@@ -22,7 +22,7 @@ const updateTableValues = async (table, values, { mysqlConnection, task }) => {
 
         const configsToUpdate = values.filter((p) => rows.some((row) => row.path === p.path));
         for (const config of configsToUpdate) {
-            await mysqlConnection.query(`
+            await databaseConnection.query(`
                 UPDATE ${table}
                 SET value = ?
                 WHERE path = ?;
@@ -50,7 +50,7 @@ const updateTableValues = async (table, values, { mysqlConnection, task }) => {
     });
 
     for (const config of configsToUpdate) {
-        await mysqlConnection.query(`
+        await databaseConnection.query(`
             UPDATE ${table}
             SET value = ?
             WHERE path = ?;
@@ -63,11 +63,11 @@ const updateTableValues = async (table, values, { mysqlConnection, task }) => {
 * @param {String} tableName
 * @param {import('../../typings/context').ListrContext} param2
 */
-const isTableExists = async (database, tableName, { mysqlConnection }) => {
+const isTableExists = async (database, tableName, { databaseConnection }) => {
     /**
     * @type {{ tableCount: number }[][]}
     */
-    const [[{ tableCount }]] = await mysqlConnection.query(`
+    const [[{ tableCount }]] = await databaseConnection.query(`
    SELECT count(*) as tableCount
    FROM information_schema.TABLES
    WHERE (TABLE_SCHEMA = ?) AND (TABLE_NAME = ?);

package/lib/util/prefix.js

@@ -22,7 +22,7 @@ const getPrefix = (fName = folderName) => {
     }
 
     if (projectInGlobalConfig && projectInGlobalConfig.prefix) {
-        return `${fName}.${projectInGlobalConfig.prefix}`;
+        return `${fName}-${projectInGlobalConfig.prefix}`;
     }
 
     return fName;

package/package.json

@@ -3,7 +3,7 @@
     "description": "Scripts and configuration used by CMA.",
     "homepage": "https://docs.create-magento-app.com/",
     "repository": "github:scandipwa/create-magento-app",
-    "version": "2.0.0-alpha.0",
+    "version": "2.0.0-alpha.3",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -53,5 +53,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "a63454a3015891e4ebe5a7e84a0c88989a1d0edc"
+    "gitHead": "b98906089cdc84e062599bdb06cfd121a8004541"
 }