clickhouse-migrations 0.1.5 → 0.1.7

package/README.md

@@ -22,8 +22,8 @@ For migrations' content should be used correct SQL ClickHouse queries. A few que
     $ clickhouse-migrations migrate <options>
 
   Required options
-      --host=<name>             Clickhouse hostname (ex. https://clickhouse)
-      --port=<number>           Port
+      --host=<name>             Clickhouse hostname 
+                                  (ex. https://clickhouse:8123)
       --user=<name>             Username
       --password=<password>     Password
       --db=<name>               Database name
@@ -32,15 +32,14 @@ For migrations' content should be used correct SQL ClickHouse queries. A few que
   Environment variables
       Instead of options can be used environment variables.
       CH_MIGRATIONS_HOST        Clickhouse hostname (--host)
-      CH_MIGRATIONS_PORT        Port (--port)
       CH_MIGRATIONS_USER        Username (--user)
       CH_MIGRATIONS_PASSWORD    Password (--password)
       CH_MIGRATIONS_DB          Database name (--db)
       CH_MIGRATIONS_HOME        Migrations' directory (--migrations-home)
 
   Examples
-      clickhouse-migrations migrate --host=http://localhost 
-      --port=8123 --user=default --password='' 
-      --db=analytics --migrations-home=/app/clickhouse/migrations
+      clickhouse-migrations migrate --host=http://localhost:8123 
+      --user=default --password='' --db=analytics 
+      --migrations-home=/app/clickhouse/migrations
 
       clickhouse-migrations migrate 

package/lib/migrate.js

@@ -61,35 +61,23 @@ var log = function (type, message, error) {
         console.error('\x1b[36m', "clickhouse-migrations :", '\x1b[31m', "Error: ".concat(message), error ? "\n\n ".concat(error) : '');
     }
 };
-var connect = function (host, port, username, password, db_name) {
+var connect = function (host, username, password, db_name) {
     var db_params = {
-        url: host,
-        port: parseInt(port),
-        debug: false,
-        basicAuth: {
-            username: username,
-            password: password,
-        },
-        isUseGzip: false,
-        format: 'json',
-        raw: false,
-        config: {
-            session_timeout: 60,
-            output_format_json_quote_64bit_integers: 0,
-            enable_http_compression: 0,
-        },
+        host: host,
+        username: username,
+        password: password,
+        application: 'clickhouse-migrations',
     };
     if (db_name) {
         db_params.database = db_name;
     }
     return new createClient(db_params);
 };
-var create_db = function (host, port, username, password, db_name) { return __awaiter(void 0, void 0, void 0, function () {
-    var client, q, e_1;
+var create_db = function (client, db_name) { return __awaiter(void 0, void 0, void 0, function () {
+    var q, e_1;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                client = connect(host, port, username, password);
                 q = "CREATE DATABASE IF NOT EXISTS ".concat(db_name, " ENGINE = Atomic");
                 _a.label = 1;
             case 1:
@@ -105,10 +93,7 @@ var create_db = function (host, port, username, password, db_name) { return __aw
                 log('error', "can't create the database ".concat(db_name, "."), e_1.message);
                 process.exit(1);
                 return [3 /*break*/, 4];
-            case 4: return [4 /*yield*/, client.close()];
-            case 5:
-                _a.sent();
-                return [2 /*return*/];
+            case 4: return [2 /*return*/];
         }
     });
 }); };
@@ -279,16 +264,16 @@ var apply_migrations = function (client, migrations, migrations_home) { return _
         }
     });
 }); };
-var migration = function (migrations_home, host, port, username, password, db_name) { return __awaiter(void 0, void 0, void 0, function () {
+var migration = function (migrations_home, host, username, password, db_name) { return __awaiter(void 0, void 0, void 0, function () {
     var migrations, client;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 migrations = get_migrations(migrations_home);
-                return [4 /*yield*/, create_db(host, port, username, password, db_name)];
+                client = connect(host, username, password, db_name);
+                return [4 /*yield*/, create_db(client, db_name)];
             case 1:
                 _a.sent();
-                client = connect(host, port, username, password, db_name);
                 return [4 /*yield*/, init_migration_table(client)];
             case 2:
                 _a.sent();
@@ -304,12 +289,11 @@ var migration = function (migrations_home, host, port, username, password, db_na
 }); };
 var migrate = function () {
     var program = new Command();
-    program.name('clickhouse-migrations').description('ClickHouse migrations.').version('0.1.5');
+    program.name('clickhouse-migrations').description('ClickHouse migrations.').version('0.1.7');
     program
         .command('migrate')
         .description('Apply migrations.')
-        .requiredOption('--host <name>', 'Clickhouse hostname (ex. https://clickhouse)', process.env.CH_MIGRATIONS_HOST)
-        .requiredOption('--port <number>', 'Port', process.env.CH_MIGRATIONS_PORT)
+        .requiredOption('--host <name>', 'Clickhouse hostname (ex: http://clickhouse:8123)', process.env.CH_MIGRATIONS_HOST)
         .requiredOption('--user <name>', 'Username', process.env.CH_MIGRATIONS_USER)
         .requiredOption('--password <password>', 'Password', process.env.CH_MIGRATIONS_PASSWORD)
         .requiredOption('--db <name>', 'Database name', process.env.CH_MIGRATIONS_DB)
@@ -317,7 +301,7 @@ var migrate = function () {
         .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, migration(options.migrationsHome, options.host, options.port, options.user, options.password, options.db)];
+                case 0: return [4 /*yield*/, migration(options.migrationsHome, options.host, options.user, options.password, options.db)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickhouse-migrations",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "CLI NodeJS ClickHouse Migrations",
   "bin": {
     "clickhouse-migrations": "lib/cli.js"