typesql-cli 0.15.2 → 0.16.0-experimental.0

package/README.md

@@ -10,7 +10,7 @@ TypeSQL supports multiple SQL database backends:
 
 - [pg](https://www.npmjs.com/package/pg) - PostgreSQL client for node.js.
 
-##### MySQL / MariaDB
+##### MySQL
 
 - [mysql2](https://www.npmjs.com/package/mysql2) - the standard driver for mysql in NodeJS
 

package/cli.js

@@ -51,16 +51,13 @@ const node_path_1 = __importStar(require("node:path"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const yargs_1 = __importDefault(require("yargs"));
 const code_generator_1 = require("./code-generator");
-const queryExectutor_1 = require("./queryExectutor");
 const sql_generator_1 = require("./sql-generator");
 const Either_1 = require("fp-ts/lib/Either");
 const code_block_writer_1 = __importDefault(require("code-block-writer"));
 const glob_1 = require("glob");
-const query_executor_1 = require("./sqlite-query-analyzer/query-executor");
-const libsql_1 = require("./drivers/libsql");
+const schema_info_1 = require("./schema-info");
 const code_generator_2 = require("./sqlite-query-analyzer/code-generator");
 const code_generator2_1 = require("./code-generator2");
-const postgres_1 = require("./drivers/postgres");
 const lodash_uniqby_1 = __importDefault(require("lodash.uniqby"));
 const CRUD_FOLDER = 'crud';
 function parseArgs() {
@@ -157,27 +154,27 @@ function compile(watch, config) {
     return __awaiter(this, void 0, void 0, function* () {
         const { sqlDir, databaseUri, client: dialect, attach, loadExtensions, authToken } = config;
         validateDirectories(sqlDir);
-        const databaseClientResult = yield createClient(databaseUri, dialect, attach, loadExtensions, authToken);
-        if ((0, Either_1.isLeft)(databaseClientResult)) {
-            console.error(`Error: ${databaseClientResult.left.description}.`);
+        const databaseClientResult = yield (0, schema_info_1.createClient)(databaseUri, dialect, attach, loadExtensions, authToken);
+        if (databaseClientResult.isErr()) {
+            console.error(`Error: ${databaseClientResult.error.description}.`);
             return;
         }
         const includeCrudTables = config.includeCrudTables || [];
-        const databaseClient = databaseClientResult.right;
-        const dbSchema = yield loadSchema(databaseClient);
-        if ((0, Either_1.isLeft)(dbSchema)) {
-            console.error(`Error: ${dbSchema.left.description}.`);
+        const databaseClient = databaseClientResult.value;
+        const dbSchema = yield (0, schema_info_1.loadSchema)(databaseClient);
+        if (dbSchema.isErr()) {
+            console.error(`Error: ${dbSchema.error.description}.`);
             return;
         }
-        yield generateCrudTables(databaseClient, sqlDir, dbSchema.right, includeCrudTables);
+        yield generateCrudTables(databaseClient, sqlDir, dbSchema.value, includeCrudTables);
         const dirGlob = `${sqlDir}/**/*.sql`;
         const sqlFiles = (0, glob_1.globSync)(dirGlob);
-        const filesGeneration = sqlFiles.map((sqlFile) => (0, code_generator_1.generateTsFile)(databaseClient, sqlFile, dbSchema.right, isCrudFile(sqlDir, sqlFile)));
+        const filesGeneration = sqlFiles.map((sqlFile) => (0, code_generator_1.generateTsFile)(databaseClient, sqlFile, dbSchema.value, isCrudFile(sqlDir, sqlFile)));
         yield Promise.all(filesGeneration);
         writeIndexFile(sqlDir, config);
         if (watch) {
             console.log('watching mode!');
-            watchDirectories(databaseClient, sqlDir, dbSchema.right, config);
+            watchDirectories(databaseClient, sqlDir, dbSchema.value, config);
         }
         else {
             // databaseClient.client.closeConnection();
@@ -205,18 +202,18 @@ function generateIndexContent(tsFiles, config) {
 function writeSql(stmtType, tableName, queryName, config) {
     return __awaiter(this, void 0, void 0, function* () {
         const { sqlDir, databaseUri, client: dialect } = config;
-        const clientResult = yield createClient(databaseUri, dialect);
-        if ((0, Either_1.isLeft)(clientResult)) {
-            console.error(clientResult.left.name);
+        const clientResult = yield (0, schema_info_1.createClient)(databaseUri, dialect);
+        if (clientResult.isErr()) {
+            console.error(clientResult.error.name);
             return false;
         }
-        const client = clientResult.right;
-        const columnsOption = yield loadTableSchema(client, tableName);
-        if ((0, Either_1.isLeft)(columnsOption)) {
-            console.error(columnsOption.left.description);
+        const client = clientResult.value;
+        const columnsOption = yield (0, schema_info_1.loadTableSchema)(client, tableName);
+        if (columnsOption.isErr()) {
+            console.error(columnsOption.error.description);
             return false;
         }
-        const columns = columnsOption.right;
+        const columns = columnsOption.value;
         const filePath = `${sqlDir}/${queryName}`;
         const generatedOk = checkAndGenerateSql(client.type, filePath, stmtType, tableName, columns);
         return generatedOk;
@@ -287,84 +284,13 @@ function filterTables(allTables, includeCrudTables) {
 }
 function selectAllTables(client) {
     return __awaiter(this, void 0, void 0, function* () {
-        const selectTablesResult = yield selectTables(client);
+        const selectTablesResult = yield (0, schema_info_1.selectTables)(client);
         if ((0, Either_1.isLeft)(selectTablesResult)) {
             return (0, Either_1.left)(`Error selecting table names: ${selectTablesResult.left.description}`);
         }
         return selectTablesResult;
     });
 }
-function createClient(databaseUri, dialect, attach, loadExtensions, authToken) {
-    return __awaiter(this, void 0, void 0, function* () {
-        switch (dialect) {
-            case 'mysql2':
-                return (0, queryExectutor_1.createMysqlClient)(databaseUri);
-            case 'better-sqlite3':
-            case 'bun:sqlite':
-                return (0, query_executor_1.createSqliteClient)(dialect, databaseUri, attach || [], loadExtensions || []);
-            case 'libsql':
-                return (0, libsql_1.createLibSqlClient)(databaseUri, attach || [], loadExtensions || [], authToken || '');
-            case 'd1':
-                return (0, query_executor_1.createD1Client)(dialect, databaseUri, loadExtensions || []);
-            case 'pg':
-                return (0, postgres_1.createPostgresClient)(databaseUri);
-        }
-    });
-}
-function loadSchema(databaseClient) {
-    return __awaiter(this, void 0, void 0, function* () {
-        switch (databaseClient.type) {
-            case 'mysql2':
-                return (0, queryExectutor_1.loadMysqlSchema)(databaseClient.client, databaseClient.schema);
-            case 'better-sqlite3':
-            case 'libsql':
-            case 'bun:sqlite':
-            case 'd1':
-                return (0, query_executor_1.loadDbSchema)(databaseClient.client);
-            case 'pg':
-                const postgresSchema = yield (0, postgres_1.loadDbSchema)(databaseClient.client);
-                const columnSchema = postgresSchema.map(schema => schema.map(col => (0, postgres_1.mapToColumnSchema)(col)));
-                if (columnSchema.isErr()) {
-                    const typesqlError = {
-                        description: columnSchema.error,
-                        name: columnSchema.error
-                    };
-                    return (0, Either_1.left)(typesqlError);
-                }
-                return (0, Either_1.right)(columnSchema.value);
-        }
-    });
-}
-function loadTableSchema(databaseClient, tableName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        switch (databaseClient.type) {
-            case 'mysql2':
-                return (0, queryExectutor_1.loadMySqlTableSchema)(databaseClient.client, databaseClient.schema, tableName);
-            case 'better-sqlite3':
-            case 'libsql':
-            case 'bun:sqlite':
-            case 'd1':
-                return yield (0, query_executor_1.loadDbSchema)(databaseClient.client);
-            case 'pg':
-                return (0, Either_1.right)([]);
-        }
-    });
-}
-function selectTables(databaseClient) {
-    return __awaiter(this, void 0, void 0, function* () {
-        switch (databaseClient.type) {
-            case 'mysql2':
-                return yield (0, queryExectutor_1.selectTablesFromSchema)(databaseClient.client);
-            case 'better-sqlite3':
-            case 'libsql':
-            case 'bun:sqlite':
-            case 'd1':
-                return (0, query_executor_1.selectSqliteTablesFromSchema)(databaseClient.client);
-            case 'pg':
-                return (0, Either_1.right)([]);
-        }
-    });
-}
 //https://stackoverflow.com/a/45242825
 function isCrudFile(sqlDir, sqlFile) {
     const relative = node_path_1.default.relative(`${sqlDir}/${CRUD_FOLDER}`, sqlFile);

package/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,sDAAyB;AACzB,uDAAwC;AACxC,wDAAgC;AAChC,kDAA0B;AAC1B,qDAA6D;AAC7D,mDAAqI;AAGrI,6CAA6D;AAC7D,0EAAgD;AAChD,+BAAgC;AAChC,+CAAwF;AACxF,2EAAsE;AACtE,uDAAmE;AACnE,kEAAmC;AAEnC,MAAM,WAAW,GAAG,MAAM,CAAC;AAE3B,SAAS,SAAS;IACjB,OAAO,eAAK;SACV,KAAK,CAAC,+BAA+B,CAAC;SACtC,MAAM,CAAC,QAAQ,EAAE;QACjB,QAAQ,EAAE,2EAA2E;QACrF,YAAY,EAAE,IAAI;QAClB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,cAAc;KACvB,CAAC;SACD,OAAO,CAAC,MAAM,EAAE,sBAAsB,EAAE,GAAG,EAAE;QAC7C,MAAM,MAAM,GAAkB;YAC7B,WAAW,EAAE,sCAAsC;YACnD,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,QAAQ;YAChB,iBAAiB,EAAE,EAAE;SACrB,CAAC;QACF,MAAM,UAAU,GAAG,gBAAgB,CAAC;QACpC,IAAA,0BAAS,EAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;IACjD,CAAC,CAAC;SACD,OAAO,CACP,CAAC,mBAAmB,EAAE,aAAa,CAAC,EACpC,2CAA2C,EAC3C,CAAC,KAAK,EAAE,EAAE;QACT,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE;YAC5B,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,kCAAkC;YAC5C,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACd,CAAC,CAAC;IACJ,CAAC,EACD,CAAC,IAAI,EAAE,EAAE;QACR,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC,CACD;SACA,OAAO,CACP,CAAC,8BAA8B,EAAE,uBAAuB,CAAC,EACzD,sBAAsB,EACtB,CAAC,KAAK,EAAE,EAAE;QACT,OAAO,KAAK;aACV,UAAU,CAAC,QAAQ,EAAE;YACrB,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,IAAI;YAClB,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;SACrE,CAAC;aACD,UAAU,CAAC,UAAU,EAAE;YACvB,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,IAAI;SAClB,CAAC;aACD,MAAM,CAAC,OAAO,EAAE;YAChB,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,IAAI;SAClB,CAAC;aACD,MAAM,EAAE,CAAC;IACZ,CAAC,EACD,CAAC,IAAI,EAAE,EAAE;QACR,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAsB,CAAC;QAC9C,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC,CACD;SAEA,MAAM,CAAC,CAAC,EAAE,qCAAqC,CAAC;SAChD,IAAI,CAAC,IAAI,CAAC;SACV,MAAM,EAAE,CAAC,IAAI,CAAC;AACjB,CAAC;AAED,SAAS,UAAU,CAAC,UAAkB;IACrC,MAAM,OAAO,GAAG,iBAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnC,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW;IACvC,IAAI,CAAC,iBAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,oCAAoC,GAAG,EAAE,CAAC,CAAC;IACxD,CAAC;AACF,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAsB,EAAE,OAAe,EAAE,QAAwB,EAAE,MAAqB;IACjH,MAAM,OAAO,GAAG,GAAG,OAAO,WAAW,CAAC;IAEtC,kBAAQ;SACN,KAAK,CAAC,OAAO,EAAE;QACf,gBAAgB,EAAE;YACjB,kBAAkB,EAAE,GAAG;SACvB;KACD,CAAC;SACD,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;SAC3F,EAAE,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAClG,CAAC;AAED,SAAe,WAAW,CAAC,MAAsB,EAAE,IAAY,EAAE,QAAwB,EAAE,UAAmB,EAAE,MAAqB;;QACpI,MAAM,IAAA,+BAAc,EAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,IAAA,iBAAK,EAAC,IAAI,CAAC,CAAC,GAAG,CAAC;QAChC,MAAM,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;CAAA;AAED,SAAe,IAAI;;QAClB,SAAS,EAAE,CAAC;IACb,CAAC;CAAA;AAED,SAAe,OAAO,CAAC,KAAc,EAAE,MAAqB;;QAC3D,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAC3F,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAE5B,MAAM,oBAAoB,GAAG,MAAM,IAAA,0BAAY,EAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;QACzG,IAAI,oBAAoB,CAAC,KAAK,EAAE,EAAE,CAAC;YAClC,OAAO,CAAC,KAAK,CAAC,UAAU,oBAAoB,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC;YACnE,OAAO;QACR,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,IAAI,EAAE,CAAC;QACzD,MAAM,cAAc,GAAG,oBAAoB,CAAC,KAAK,CAAC;QAElD,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAU,EAAC,cAAc,CAAC,CAAC;QAClD,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CAAC,UAAU,QAAQ,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC;YACvD,OAAO;QACR,CAAC;QAED,MAAM,kBAAkB,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QACpF,MAAM,OAAO,GAAG,GAAG,MAAM,WAAW,CAAC;QAErC,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,OAAO,CAAC,CAAC;QAEnC,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,+BAAc,EAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QACxI,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAEnC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE/B,IAAI,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAC9B,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACP,2CAA2C;QAC5C,CAAC;IACF,CAAC;CAAA;AAED,SAAe,cAAc,CAAC,MAAc,EAAE,MAAqB;;QAClE,MAAM,OAAO,GAAG,iBAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,UAAU,IAAI,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC;QAE5H,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC3D,MAAM,aAAa,GAAG,GAAG,MAAM,WAAW,CAAC;QAC3C,IAAA,0BAAS,EAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IACxC,CAAC;CAAA;AAED,wBAAwB;AACxB,SAAS,oBAAoB,CAAC,OAAiB,EAAE,MAAqB;IACrE,MAAM,MAAM,GAAG,IAAI,2BAAe,EAAE,CAAC;IACrC,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,mBAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,yBAAyB;QAC1E,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;QAC7E,MAAM,CAAC,SAAS,CAAC,oBAAoB,QAAQ,GAAG,MAAM,IAAI,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;AAC1B,CAAC;AAED,SAAe,QAAQ,CAAC,QAAsB,EAAE,SAAiB,EAAE,SAAiB,EAAE,MAAqB;;QAC1G,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QACxD,MAAM,YAAY,GAAG,MAAM,IAAA,0BAAY,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9D,IAAI,YAAY,CAAC,KAAK,EAAE,EAAE,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvC,OAAO,KAAK,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC;QAElC,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAe,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC/D,IAAI,aAAa,CAAC,KAAK,EAAE,EAAE,CAAC;YAC3B,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC/C,OAAO,KAAK,CAAC;QACd,CAAC;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC;QACpC,MAAM,QAAQ,GAAG,GAAG,MAAM,IAAI,SAAS,EAAE,CAAC;QAE1C,MAAM,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7F,OAAO,WAAW,CAAC;IACpB,CAAC;CAAA;AAED,SAAS,mBAAmB,CAC3B,OAAuB,EACvB,QAAgB,EAChB,QAAsB,EACtB,SAAiB,EACjB,OAAuB;IAEvB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,CAAC,KAAK,CAAC,6BAA6B,SAAS,2CAA2C,CAAC,CAAC;QACjG,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACxE,IAAA,0BAAS,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAClC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;IACzC,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,WAAW,CAAC,OAAuB,EAAE,QAAsB,EAAE,SAAiB,EAAE,OAAuB;IAC/G,QAAQ,QAAQ,EAAE,CAAC;QAClB,KAAK,QAAQ,CAAC;QACd,KAAK,GAAG;YACP,OAAO,IAAA,uCAAuB,EAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7D,KAAK,QAAQ,CAAC;QACd,KAAK,GAAG;YACP,OAAO,IAAA,uCAAuB,EAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7D,KAAK,QAAQ,CAAC;QACd,KAAK,GAAG;YACP,OAAO,IAAA,uCAAuB,EAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7D,KAAK,QAAQ,CAAC;QACd,KAAK,GAAG;YACP,OAAO,IAAA,uCAAuB,EAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;AACF,CAAC;AAED,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;AAE5C,SAAe,kBAAkB,CAAC,MAAsB,EAAE,aAAqB,EAAE,QAAwB,EAAE,iBAA2B;;QAErI,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAmB,CAAA,CAAC,CAAC;QAClG,MAAM,YAAY,GAAG,IAAA,uBAAM,EAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QACjF,MAAM,cAAc,GAAG,YAAY,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;QACrE,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE,CAAC;YACxC,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC;YAClC,MAAM,QAAQ,GAAG,GAAG,aAAa,IAAI,WAAW,IAAI,SAAS,GAAG,CAAC;YACjE,IAAI,CAAC,iBAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC9B,iBAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,CAAC;YAED,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;YAClE,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC9B,mBAAmB,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,eAAe,SAAS,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;gBAC1G,mBAAmB,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,eAAe,SAAS,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;gBAC1G,mBAAmB,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,UAAU,SAAS,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;gBACrG,mBAAmB,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,eAAe,SAAS,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YAC3G,CAAC;iBAAM,CAAC;gBACP,oBAAoB,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,eAAe,SAAS,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAC3G,oBAAoB,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,eAAe,SAAS,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAC3G,oBAAoB,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,UAAU,SAAS,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gBACtG,oBAAoB,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,QAAQ,eAAe,SAAS,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC5G,CAAC;QACF,CAAC;IACF,CAAC;CAAA;AAED,SAAS,oBAAoB,CAAC,MAAwC,EAAE,QAAgB,EAAE,SAAoB,EAAE,SAAiB,EAAE,OAAuB;IAEzJ,MAAM,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAA,8BAAc,EAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAA,6BAAY,EAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC9I,IAAA,0BAAS,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7B,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,YAAY,CAAC,SAAkB,EAAE,iBAA2B;IACpE,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC;IACrE,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC;AAChH,CAAC;AAED,SAAe,eAAe,CAAC,MAAsB;;QACpD,MAAM,kBAAkB,GAAG,MAAM,IAAA,0BAAY,EAAC,MAAM,CAAC,CAAC;QACtD,IAAI,IAAA,eAAM,EAAC,kBAAkB,CAAC,EAAE,CAAC;YAChC,OAAO,IAAA,aAAI,EAAC,gCAAgC,kBAAkB,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACpF,CAAC;QACD,OAAO,kBAAkB,CAAC;IAC3B,CAAC;CAAA;AAED,sCAAsC;AACtC,SAAS,UAAU,CAAC,MAAc,EAAE,OAAe;IAClD,MAAM,QAAQ,GAAG,mBAAI,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;IACpE,MAAM,MAAM,GAAG,QAAQ,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC5F,OAAO,MAAM,CAAC;AACf,CAAC"}

package/code-generator2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-generator2.d.ts","sourceRoot":"","sources":["../../src/code-generator2.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,SAAS,EAAE,SAAS,EAAa,iBAAiB,EAAyB,YAAY,EAAE,MAAM,SAAS,CAAC;AAEhI,OAAO,EAAc,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAIxE,OAAO,EAAW,WAAW,EAAE,MAAM,YAAY,CAAC;AAMlD,wBAAgB,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAOjH;AAgWD,wBAAgB,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,UAoD3G;AAgJD,wBAAgB,0CAA0C,CAAC,GAAG,EAAE,YAAY,GAAG,iBAAiB,CAM/F"}
+{"version":3,"file":"code-generator2.d.ts","sourceRoot":"","sources":["../../src/code-generator2.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,SAAS,EAAE,SAAS,EAAa,iBAAiB,EAAyB,YAAY,EAAE,MAAM,SAAS,CAAC;AAEhI,OAAO,EAAc,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAIxE,OAAO,EAAW,WAAW,EAAE,MAAM,YAAY,CAAC;AAOlD,wBAAgB,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAOjH;AAwmBD,wBAAgB,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,UAoD3G;AA+ID,wBAAgB,0CAA0C,CAAC,GAAG,EAAE,YAAY,GAAG,iBAAiB,CAM/F"}

package/code-generator2.js

@@ -14,6 +14,7 @@ const describe_query_1 = require("./describe-query");
 const neverthrow_1 = require("neverthrow");
 const code_generator_2 = require("./sqlite-query-analyzer/code-generator");
 const ts_nested_descriptor_1 = require("./ts-nested-descriptor");
+const node_os_1 = require("node:os");
 function generateCode(client, sql, queryName) {
     if (isEmptySql(sql)) {
         return (0, neverthrow_1.okAsync)('');
@@ -43,11 +44,17 @@ function generateTsCode(sqlOld, queryName, schemaDef, client, isCrud = false) {
     const resultTypeName = `${capitalizedName}Result`;
     const paramsTypeName = `${capitalizedName}Params`;
     const orderByTypeName = `${capitalizedName}OrderBy`;
+    const dynamicParamsTypeName = `${capitalizedName}DynamicParams`;
+    const selectColumnsTypeName = `${capitalizedName}Select`;
+    const whereTypeName = `${capitalizedName}Where`;
     const tsDescriptor = createTsDescriptor(schemaDef);
     const uniqueParams = (0, code_generator_1.removeDuplicatedParameters2)(tsDescriptor.parameters);
     const generateOrderBy = tsDescriptor.orderByColumns != null && tsDescriptor.orderByColumns.length > 0;
     const codeWriter = getCodeWriter(client);
     codeWriter.writeImports(writer);
+    if (tsDescriptor.dynamicQuery2) {
+        writer.writeLine(`import { EOL } from 'os';`);
+    }
     const uniqueDataParams = (0, code_generator_1.removeDuplicatedParameters2)(tsDescriptor.data || []);
     if (uniqueDataParams.length > 0) {
         writer.blankLine();
@@ -59,6 +66,258 @@ function generateTsCode(sqlOld, queryName, schemaDef, client, isCrud = false) {
     }
     writer.blankLine();
     writeResultType(writer, resultTypeName, tsDescriptor.columns);
+    const dynamicQueryInfo = tsDescriptor.dynamicQuery2;
+    if (dynamicQueryInfo) {
+        writer.blankLine();
+        writer.write(`export type ${dynamicParamsTypeName} = `).block(() => {
+            writer.writeLine(`select?: ${selectColumnsTypeName};`);
+            if (tsDescriptor.parameters.length > 0) {
+                writer.writeLine(`params: ${paramsTypeName};`);
+            }
+            writer.writeLine(`where?: ${whereTypeName}[];`);
+            // if (orderByField) {
+            // 	writer.writeLine(`${orderByField};`);
+            // }
+        });
+        writer.blankLine();
+        writer.write(`export type ${selectColumnsTypeName} =`).block(() => {
+            tsDescriptor.columns.forEach((tsField) => {
+                writer.writeLine(`${tsField.name}?: boolean;`);
+            });
+        });
+        writer.blankLine();
+        writer.write('const selectFragments = ').inlineBlock(() => {
+            dynamicQueryInfo.select.forEach((fragment, index) => {
+                const field = tsDescriptor.columns[index].name;
+                writer.writeLine(`${field}: \`${fragment.fragmentWitoutAlias}\`,`);
+            });
+        });
+        writer.write(' as const;');
+        writer.blankLine();
+        writer.writeLine(`const NumericOperatorList = ['=', '<>', '>', '<', '>=', '<='] as const;`);
+        writer.writeLine('type NumericOperator = typeof NumericOperatorList[number];');
+        if ((0, code_generator_1.hasStringColumn)(tsDescriptor.columns)) {
+            writer.writeLine(`type StringOperator = '=' | '<>' | '>' | '<' | '>=' | '<=' | 'LIKE';`);
+        }
+        writer.writeLine(`type SetOperator = 'IN' | 'NOT IN';`);
+        writer.writeLine(`type BetweenOperator = 'BETWEEN';`);
+        writer.blankLine();
+        writer.write(`export type ${whereTypeName} =`).indent(() => {
+            for (const col of tsDescriptor.columns) {
+                writer.writeLine(`| ['${col.name}', ${(0, code_generator_1.getOperator)(col.tsType)}, ${col.tsType} | null]`);
+                writer.writeLine(`| ['${col.name}', SetOperator, ${col.tsType}[]]`);
+                writer.writeLine(`| ['${col.name}', BetweenOperator, ${col.tsType} | null, ${col.tsType} | null]`);
+            }
+        });
+        writer.blankLine();
+        let functionArguments = 'client: pg.Client | pg.Pool';
+        // if (params.data.length > 0) {
+        // 	functionParams += `, data: ${dataType}`;
+        // }
+        functionArguments += `, params?: ${dynamicParamsTypeName}`;
+        writer.writeLine('let currentIndex: number;');
+        writer.write(`export async function ${camelCaseName}(${functionArguments}): Promise<${resultTypeName}[]>`).block(() => {
+            writer.writeLine(`currentIndex = ${tsDescriptor.parameters.length};`);
+            writer.writeLine('const where = whereConditionsToObject(params?.where);');
+            // if (orderByField != null) {
+            // 	writer.writeLine('const orderBy = orderByToObject(params.orderBy);');
+            // }
+            writer.writeLine('const paramsValues: any = [];');
+            if (dynamicQueryInfo.with.length > 0) {
+                writer.writeLine(`let withClause = '';`);
+                dynamicQueryInfo.with.forEach((withFragment) => {
+                    var _a;
+                    const selectConditions = withFragment.dependOnFields.map((fieldIndex) => `params.select.${tsDescriptor.columns[fieldIndex].name}`);
+                    if (selectConditions.length > 0) {
+                        selectConditions.unshift('params?.select == null');
+                    }
+                    const whereConditions = withFragment.dependOnFields.map((fieldIndex) => `where.${tsDescriptor.columns[fieldIndex].name} != null`);
+                    const orderByConditions = ((_a = withFragment.dependOnOrderBy) === null || _a === void 0 ? void 0 : _a.map((orderBy) => `orderBy['${orderBy}'] != null`)) || [];
+                    const allConditions = [...selectConditions, ...whereConditions, ...orderByConditions];
+                    const paramValues = withFragment.parameters.map((paramIndex) => {
+                        const param = tsDescriptor.parameters[paramIndex];
+                        return `params?.params?.${param.name}`;
+                    });
+                    if (allConditions.length > 0) {
+                        writer.write(`if (${allConditions.join(`${node_os_1.EOL}\t|| `)})`).block(() => {
+                            writer.writeLine(`if (withClause !== '') withClause += ',' + EOL;`);
+                            writer.write(`withClause += \`${withFragment.fragment}\`;`);
+                            paramValues.forEach((paramValues) => {
+                                writer.writeLine(`paramsValues.push(${paramValues});`);
+                            });
+                        });
+                    }
+                    else {
+                        writer.write(`withClause.push(\`${withFragment.fragment}\`);`);
+                        paramValues.forEach((paramValues) => {
+                            writer.writeLine(`paramsValues.push(${paramValues});`);
+                        });
+                    }
+                });
+            }
+            writer.writeLine(`let sql = 'SELECT';`);
+            if (dynamicQueryInfo.with.length > 0) {
+                writer.write('if (withClause)').block(() => {
+                    writer.writeLine(`sql = 'WITH' + EOL + withClause + EOL + sql;`);
+                });
+            }
+            dynamicQueryInfo.select.forEach((select, index) => {
+                writer.write(`if (params?.select == null || params.select.${tsDescriptor.columns[index].name})`).block(() => {
+                    writer.writeLine(`sql = appendSelect(sql, \`${select.fragment}\`);`);
+                    select.parameters.forEach((param) => {
+                        writer.writeLine(`paramsValues.push(params?.params?.${param} ?? null);`);
+                    });
+                });
+            });
+            dynamicQueryInfo.from.forEach((from) => {
+                var _a;
+                const selectConditions = from.dependOnFields.map((fieldIndex) => `params.select.${tsDescriptor.columns[fieldIndex].name}`);
+                if (selectConditions.length > 0) {
+                    selectConditions.unshift('params?.select == null');
+                }
+                const whereConditions = from.dependOnFields.map((fieldIndex) => `where.${tsDescriptor.columns[fieldIndex].name} != null`);
+                const orderByConditions = ((_a = from.dependOnOrderBy) === null || _a === void 0 ? void 0 : _a.map((orderBy) => `orderBy['${orderBy}'] != null`)) || [];
+                const allConditions = [...selectConditions, ...whereConditions, ...orderByConditions];
+                const paramValues = from.parameters.map((paramIndex) => {
+                    const param = tsDescriptor.parameters[paramIndex];
+                    return `params?.params?.${param.name}`;
+                });
+                if (allConditions.length > 0) {
+                    writer.write(`if (${allConditions.join(`${node_os_1.EOL}\t|| `)})`).block(() => {
+                        writer.write(`sql += EOL + \`${from.fragment}\`;`);
+                        paramValues.forEach((paramValues) => {
+                            writer.writeLine(`paramsValues.push(${paramValues});`);
+                        });
+                    });
+                }
+                else {
+                    writer.writeLine(`sql += EOL + \`${from.fragment}\`;`);
+                    paramValues.forEach((paramValues) => {
+                        writer.writeLine(`paramsValues.push(${paramValues});`);
+                    });
+                }
+            });
+            writer.writeLine('sql += EOL + `WHERE 1 = 1`;');
+            dynamicQueryInfo.where.forEach((fragment) => {
+                const paramValues = fragment.parameters.map((paramIndex) => {
+                    const param = tsDescriptor.parameters[paramIndex];
+                    return `params?.params?.${param.name} ?? null`;
+                });
+                writer.writeLine(`sql += EOL + \`${fragment.fragment}\`;`);
+                paramValues.forEach((paramValues) => {
+                    writer.writeLine(`paramsValues.push(${paramValues});`);
+                });
+            });
+            writer.write('params?.where?.forEach(condition => ').inlineBlock(() => {
+                writer.writeLine('const where = whereCondition(condition);');
+                dynamicQueryInfo.select.forEach((select, index) => {
+                    if (select.parameters.length > 0) {
+                        writer.write(`if (condition[0] == '${tsDescriptor.columns[index].name}')`).block(() => {
+                            select.parameters.forEach((param) => {
+                                writer.writeLine(`paramsValues.push(params?.params?.${param} ?? null);`);
+                            });
+                        });
+                    }
+                });
+                writer.write('if (where?.hasValue)').block(() => {
+                    writer.writeLine(`sql += EOL + 'AND ' + where.sql;`);
+                    writer.write('paramsValues.push(...where.values);');
+                });
+            });
+            writer.write(');').newLine();
+            writer.write(`return client.query({ text: sql, rowMode: 'array', values: paramsValues })`).newLine();
+            writer.indent().write(`.then(res => res.rows.map(row => mapArrayTo${resultTypeName}(row, params?.select)));`);
+        });
+        writer.blankLine();
+        writer.write(`function mapArrayTo${resultTypeName}(data: any, select?: ${selectColumnsTypeName})`).block(() => {
+            writer.writeLine(`const result = {} as ${resultTypeName};`);
+            writer.writeLine('let rowIndex = -1;');
+            tsDescriptor.columns.forEach((tsField) => {
+                writer.write(`if (select == null || select.${tsField.name})`).block(() => {
+                    writer.writeLine('rowIndex++;');
+                    writer.writeLine(`result.${tsField.name} = ${toDriver('data[rowIndex]', tsField)};`);
+                });
+            });
+            writer.write('return result;');
+        });
+        writer.blankLine();
+        writer.write('function appendSelect(sql: string, selectField: string)').block(() => {
+            writer.write(`if (sql.toUpperCase().endsWith('SELECT'))`).block(() => {
+                writer.writeLine('return sql + EOL + selectField;');
+            });
+            writer.write('else').block(() => {
+                writer.writeLine(`return sql + ', ' + EOL + selectField;`);
+            });
+        });
+        writer.blankLine();
+        writer.write(`function whereConditionsToObject(whereConditions?: ${whereTypeName}[])`).block(() => {
+            writer.writeLine('const obj = {} as any;');
+            writer.write('whereConditions?.forEach(condition => ').inlineBlock(() => {
+                writer.writeLine('obj[condition[0]] = true;');
+            });
+            writer.write(');');
+            writer.writeLine('return obj;');
+        });
+        // if (orderByField != null) {
+        // 	writer.blankLine();
+        // 	writer.write(`function orderByToObject(orderBy: ${dynamicParamsTypeName}['orderBy'])`).block(() => {
+        // 		writer.writeLine('const obj = {} as any;');
+        // 		writer.write('orderBy?.forEach(order => ').inlineBlock(() => {
+        // 			writer.writeLine('obj[order[0]] = true;');
+        // 		});
+        // 		writer.write(');');
+        // 		writer.writeLine('return obj;');
+        // 	});
+        // }
+        writer.blankLine();
+        writer.write('type WhereConditionResult = ').block(() => {
+            writer.writeLine('sql: string;');
+            writer.writeLine('hasValue: boolean;');
+            writer.writeLine('values: any[];');
+        });
+        writer.blankLine();
+        writer.write(`function whereCondition(condition: ${whereTypeName}): WhereConditionResult | null `).block(() => {
+            writer.blankLine();
+            writer.writeLine('const selectFragment = selectFragments[condition[0]];');
+            writer.writeLine('const operator = condition[1];');
+            writer.blankLine();
+            if ((0, code_generator_1.hasStringColumn)(tsDescriptor.columns)) {
+                writer.write(`if (operator == 'LIKE') `).block(() => {
+                    writer.write('return ').block(() => {
+                        writer.writeLine("sql: `${selectFragment} LIKE ${placeholder()}`,");
+                        writer.writeLine('hasValue: condition[2] != null,');
+                        writer.writeLine('values: [condition[2]]');
+                    });
+                });
+            }
+            writer.write(`if (operator == 'BETWEEN') `).block(() => {
+                writer.write('return ').block(() => {
+                    writer.writeLine('sql: `${selectFragment} BETWEEN ${placeholder()} AND ${placeholder()}`,');
+                    writer.writeLine('hasValue: condition[2] != null && condition[3] != null,');
+                    writer.writeLine('values: [condition[2], condition[3]]');
+                });
+            });
+            writer.write(`if (operator == 'IN' || operator == 'NOT IN') `).block(() => {
+                writer.write('return ').block(() => {
+                    writer.writeLine("sql: `${selectFragment} ${operator} (${condition[2]?.map(_ => placeholder()).join(', ')})`,");
+                    writer.writeLine('hasValue: condition[2] != null && condition[2].length > 0,');
+                    writer.writeLine('values: condition[2]');
+                });
+            });
+            writer.write('if (NumericOperatorList.includes(operator)) ').block(() => {
+                writer.write('return ').block(() => {
+                    writer.writeLine('sql: `${selectFragment} ${operator} ${placeholder()}`,');
+                    writer.writeLine('hasValue: condition[2] != null,');
+                    writer.writeLine('values: [condition[2]]');
+                });
+            });
+            writer.writeLine('return null;');
+        });
+        writer.blankLine();
+        writer.write('function placeholder(): string').block(() => {
+            writer.writeLine('return `$${++currentIndex}`;');
+        });
+    }
     if (tsDescriptor.nestedDescriptor2) {
         const relations = tsDescriptor.nestedDescriptor2;
         relations.forEach((relation) => {
@@ -78,23 +337,25 @@ function generateTsCode(sqlOld, queryName, schemaDef, client, isCrud = false) {
             });
         });
     }
-    writer.blankLine();
-    const execFunctionParams = {
-        sql,
-        queryType: tsDescriptor.queryType,
-        multipleRowsResult: tsDescriptor.multipleRowsResult,
-        functionName: queryName,
-        paramsType: paramsTypeName,
-        dataType: dataTypeName,
-        returnType: resultTypeName,
-        columns: tsDescriptor.columns,
-        parameters: tsDescriptor.parameters,
-        data: tsDescriptor.data || [],
-        returning: schemaDef.returning || false,
-        generateNested: tsDescriptor.nestedDescriptor2 != null,
-        nestedType: tsDescriptor.nestedDescriptor2 ? tsDescriptor.nestedDescriptor2[0].name : ''
-    };
-    codeWriter.writeExecFunction(writer, execFunctionParams);
+    if (!dynamicQueryInfo) {
+        writer.blankLine();
+        const execFunctionParams = {
+            sql,
+            queryType: tsDescriptor.queryType,
+            multipleRowsResult: tsDescriptor.multipleRowsResult,
+            functionName: queryName,
+            paramsType: paramsTypeName,
+            dataType: dataTypeName,
+            returnType: resultTypeName,
+            columns: tsDescriptor.columns,
+            parameters: tsDescriptor.parameters,
+            data: tsDescriptor.data || [],
+            returning: schemaDef.returning || false,
+            generateNested: tsDescriptor.nestedDescriptor2 != null,
+            nestedType: tsDescriptor.nestedDescriptor2 ? tsDescriptor.nestedDescriptor2[0].name : ''
+        };
+        codeWriter.writeExecFunction(writer, execFunctionParams);
+    }
     if (tsDescriptor.nestedDescriptor2) {
         const relations = tsDescriptor.nestedDescriptor2;
         relations.forEach((relation, index) => {
@@ -166,13 +427,16 @@ function createTsDescriptor(schemaDef) {
         });
         tsDescriptor.nestedDescriptor2 = nestedDescriptor2;
     }
+    if (schemaDef.dynamicSqlQuery2) {
+        tsDescriptor.dynamicQuery2 = schemaDef.dynamicSqlQuery2;
+    }
     return tsDescriptor;
 }
-function mapColumnInfoToTsFieldDescriptor(col) {
+function mapColumnInfoToTsFieldDescriptor(col, dynamicQuery) {
     const tsField = {
         name: col.columnName,
         tsType: (0, postgres_1.mapColumnType)(col.type),
-        notNull: col.notNull
+        notNull: dynamicQuery ? false : col.notNull
     };
     return tsField;
 }
@@ -288,7 +552,7 @@ const postgresCodeWriter = {
 };
 function getColumnsForQuery(schemaDef) {
     if (schemaDef.queryType === 'Select' || schemaDef.returning) {
-        const columns = schemaDef.columns.map(col => mapColumnInfoToTsFieldDescriptor(col));
+        const columns = schemaDef.columns.map(col => mapColumnInfoToTsFieldDescriptor(col, schemaDef.dynamicSqlQuery2 != null));
         const escapedColumnsNames = (0, code_generator_1.renameInvalidNames)(schemaDef.columns.map((col) => col.columnName));
         return columns.map((col, index) => (Object.assign(Object.assign({}, col), { name: escapedColumnsNames[index] })));
     }
@@ -438,20 +702,19 @@ function writeCrudUpdate(writer, crudParamters) {
     writer.write(`export async function ${queryName}(client: pg.Client | pg.Pool, data: ${dataTypeName}, params: ${paramsTypeName}): Promise<${resultTypeName} | null>`).block(() => {
         writer.writeLine(`let sql = 'UPDATE ${tableName} SET';`);
         writer.writeLine('const values: any[] = [];');
-        writer.writeLine('let update = false;');
         nonKeys.forEach((col, index) => {
             writer.write(`if (data.${col} !== undefined)`).block(() => {
+                writer.conditionalWriteLine(index > 0, `if (values.length > 0) sql += ',';`);
                 writer.writeLine(`sql += ' ${col} = $${index + 1}';`);
                 writer.writeLine(`values.push(data.${col});`);
-                writer.writeLine('update = true;');
             });
         });
         const keyName = keys[0];
         writer.writeLine(`sql += ' WHERE ${keyName} = $${nonKeys.length + 1} RETURNING *';`);
         writer.writeLine(`values.push(params.${keyName});`);
-        writer.write('if (update)').block(() => {
+        writer.write('if (values.length > 0)').block(() => {
             writer.writeLine('return client.query({ text: sql, values })');
-            writer.indent().write(`.then(res => mapArrayTo${resultTypeName}(res));`);
+            writer.indent().write(`.then(res => res.rows.length > 0 ? mapArrayTo${resultTypeName}(res) : null);`);
         });
         writer.writeLine('return null;');
     });