Merge pull request #44 from wsporto/dynamic-query

Dynamic query

Author: wsporto

migrations/postgres/V6__seed.sql

@@ -0,0 +1,24 @@
+INSERT INTO mytable1(
+	value
+) VALUES 
+	(1), 
+	(2), 
+	(3), 
+	(4);
+
+INSERT INTO mytable2(
+	name,
+	descr
+) VALUES 
+	('one', 'descr-one'), 
+	('two', 'descr-two'), 
+	('three', 'descr-three'),
+	('four', null);
+
+INSERT INTO public.all_types (bool_column,bytea_column,char_column,name_column,int8_column,int2_column,int4_column,text_column,varchar_column,date_column,bit_column,numeric_column,uuid_column,float4_column,float8_column,timestamp_column,timestamp_not_null_column,timestamptz_column,timestamptz_not_null_column) VALUES
+	 (NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-12-31 00:00:00',NULL,'2024-12-31 00:00:00-03'),
+	 (NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-01-01 00:00:00',NULL,'2025-01-01 00:00:00-03'),
+	 (NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-01-02 00:00:00',NULL,'2025-01-02 00:00:00-03'),
+	 (NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-01-03 00:00:00',NULL,'2025-01-03 00:00:00-03'),
+	 (NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-02-04 00:00:00',NULL,'2025-02-04 00:00:00-03'),
+	 (NULL,NULL,NULL,NULL,NULL,NULL,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-02-05 00:00:00',NULL,'2025-02-05 00:00:00-03');

src/code-generator2.ts

@@ -11,13 +11,14 @@ import { NotNullInfo, PostgresTraverseResult } from './traverse';
 import { describeNestedQuery } from '../sqlite-query-analyzer/sqlite-describe-nested-query';
 import { isLeft } from 'fp-ts/lib/Either';
 import { hasAnnotation } from '../describe-query';
+import { describeDynamicQuery2 } from '../describe-dynamic-query';
 
 function describeQueryRefine(sql: string, postgresDescribeResult: PostgresDescribe, dbSchema: PostgresColumnSchema[], namedParameters: string[]): Result<SchemaDef, string> {
 
-	const gererateNested = hasAnnotation(sql, '@nested');
-	// const gererateDynamicQuery = hasAnnotation(sql, '@dynamicQuery');
+	const generateNestedInfo = hasAnnotation(sql, '@nested');
+	const generateDynamicQueryInfo = hasAnnotation(sql, '@dynamicQuery');
 
-	const parseResult = safeParseSql(sql, dbSchema, gererateNested);
+	const parseResult = safeParseSql(sql, dbSchema, { collectNestedInfo: generateNestedInfo, collectDynamicQueryInfo: generateDynamicQueryInfo });
 	if (parseResult.isErr()) {
 		return err(parseResult.error)
 	}
@@ -49,6 +50,10 @@ function describeQueryRefine(sql: string, postgresDescribeResult: PostgresDescri
 		}
 		descResult.nestedInfo = nestedResult.right;
 	}
+	if (traverseResult.dynamicQueryInfo) {
+		const dynamicSqlQueryInfo = describeDynamicQuery2(traverseResult.dynamicQueryInfo, namedParameters, []);
+		descResult.dynamicSqlQuery2 = dynamicSqlQueryInfo;
+	}
 	return ok(descResult);
 }
 

src/postgres-query-analyzer/describe.ts

@@ -1,20 +1,19 @@
 import { parseSql as _parseSql } from '@wsporto/typesql-parser/postgres';
-import { PostgresTraverseResult, traverseSmt } from './traverse';
+import { defaultOptions, PostgresTraverseResult, traverseSmt } from './traverse';
 import { PostgresColumnSchema } from '../drivers/types';
 import { Result, err, ok } from 'neverthrow';
 
-
-export function parseSql(sql: string, dbSchema: PostgresColumnSchema[], gererateNested = false): PostgresTraverseResult {
+export function parseSql(sql: string, dbSchema: PostgresColumnSchema[], options = defaultOptions()): PostgresTraverseResult {
 	const parser = _parseSql(sql);
 
-	const traverseResult = traverseSmt(parser.stmt(), dbSchema, gererateNested);
+	const traverseResult = traverseSmt(parser.stmt(), dbSchema, options);
 
 	return traverseResult;
 }
 
-export function safeParseSql(sql: string, dbSchema: PostgresColumnSchema[], gererateNested: boolean): Result<PostgresTraverseResult, string> {
+export function safeParseSql(sql: string, dbSchema: PostgresColumnSchema[], options = defaultOptions()): Result<PostgresTraverseResult, string> {
 	try {
-		const result = parseSql(sql, dbSchema, gererateNested);
+		const result = parseSql(sql, dbSchema, options);
 		return ok(result);
 	}
 	catch (e) {