boom-deploy - npm Package Compare versions

Comparing version 0.2.79 to 0.2.80

helpers/dumps.js

@@ -432,3 +432,3 @@
 		var keyspace = exportCassandra.keyspace;
-		return lazySsh('ssh dsde274 \'cqlsh ' + host + ' -e "COPY ' + keyspace + '.' + table + ' TO STDOUT" | head -n 10000000\'' +
+		return lazySsh('ssh dsde274 \'cqlsh ' + host + ' -e "COPY ' + keyspace + '.' + table + ' TO STDOUT" | head -n 30000000\'' +
 					   ' > {{cassandraDumpDir}}/' + dumpName + '/' + table + '.rows');
@@ -435,0 +435,0 @@ }

helpers/web.js

@@ -146,7 +146,7 @@ new Helper(function webMysqlExport(dumpPath, options){
 		users: {
-			login    : 'IF(login IN (' + developersString + '), login, SHA1(login))',
-			role_id  : 'IF(login IN (' + developersString + '), \'developer\', role_id)',
-			password : 'IF(login IN (' + developersString + '), password, SUBSTRING(SHA1(PASSWORD), 1, 8))',
-			mail     : 'IF(login IN (' + developersString + '), mail, CONCAT(SHA1(mail), \'@pochta.com\'))',
-			phone    : 'IF(login IN (' + developersString + '), phone, user_id + 80000000000)'
+			login    : 'IF(login IN (' + developersString + '), login, concat(\'u\', user_id)) AS login',
+			role_id  : 'IF(login IN (' + developersString + '), \'developer\', role_id) AS role_id',
+			password : 'IF(login IN (' + developersString + '), password, SUBSTRING(SHA1(login), 1, 8)) AS password',
+			mail     : 'IF(login IN (' + developersString + '), mail, CONCAT(\'u\', user_id, \'@pochta.com\')) AS mail',
+			phone    : 'IF(login IN (' + developersString + '), phone, user_id + 80000000000) AS phone'
 		}
@@ -156,5 +156,3 @@ };
 	var fieldsForRaplace = tablesForReplace[tableName];
-	if (!fieldsForRaplace) {
-		return 'SELECT * FROM ' + mysql.dbname + '.' + tableName;
-	}
+
 	var out = lazySsh('mysql ' + getMysqlConnectParams(mysql) +
@@ -164,2 +162,7 @@ ' -e \"SELECT group_concat(COLUMN_NAME) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = \'' + mysql.dbname + '\' AND TABLE_NAME = \'' + tableName + '\'\"');
 	var fields = out.split('\n')[1].split(',');
+
+	if (!fieldsForRaplace) {
+		return 'SELECT ' + fields.join() + ' FROM ' + mysql.dbname + '.' + tableName;
+	}
+
 	var replacedFields = fields.map(function(value){
@@ -171,3 +174,3 @@ if (!fieldsForRaplace[value]) return value;
 	sql    += replacedFields.join(', ');
-	sql    += ' FROM ' + mysql.dbname + '.' + tableName + ' LIMIT 10';
+	sql    += ' FROM ' + mysql.dbname + '.' + tableName;
 	return sql;
@@ -192,5 +195,5 @@ });
 		lazySsh('mysql ' + getMysqlConnectParams(get('mysql')) +
-				' -e ' + JSON.stringify(sql) + ' > ' + dumpTmpPath +
-				' && cp ' + dumpTmpPath + ' {{mysqlDumpDir}}/');
-		lazySsh('ls -lah {{mysqlDumpDir}}');
+				// ' -e ' + JSON.stringify(sql).slice(0, -1) + ' INTO OUTFILE \'' + dumpTmpPath + '\' FIELDS TERMINATED BY \'\\t\' LINES TERMINATED BY \'\\n\'"');
+				' -e ' + JSON.stringify(sql) + ' -N | less | sed \"s/	NULL/	\\\\\\N/g\" > ' + dumpTmpPath);
+		lazySsh('tail -n 10 ' + dumpTmpPath);
 		// lazySsh('echo "SELECT login, password, role_id, mail, phone FROM view_users WHERE role_id=\'developer\' LIMIT 20" | mysql ' + getMysqlConnectParams(mysql));
@@ -197,0 +200,0 @@

package.json

 {
   "name": "boom-deploy",
   "main": "boom.js",
-  "version": "0.2.79",
+  "version": "0.2.80",
   "description": "deploy your app",
@@ -6,0 +6,0 @@ "keywords": [

No alert changes

Improved metrics

Total package byte prevSize

91429

increased by0.23%

No dependency changes