Fix linebreaks in generated SQL #326
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
worksofliam
reviewed
Jan 31, 2025
src/database/schemas.ts
Outdated
| ].join(` `), { parameters: [object, schema, internalType] }); | ||
| const lines = await JobManager.runSQL<{ LINE: string }>( | ||
| `select LINE | ||
| from table( QSYS2.IFS_READ( PATH_NAME => '/tmp/Q_GENSQL_' concat current_user concat '.sql' ) )` |
There was a problem hiding this comment.
At this point, should we just use our own Code for IBM i API to get the contents of the file?
There was a problem hiding this comment.
We could... and we could also use our own C4i API to run the SQL and get the result in one step instead of these multiple calls. And maybe use the temporary streamfile API?
I'm quite busy currently with bigger projects at work, so we either
- wait for me to get some spare time
- let you code it or
- put a TODO in the source.
Which do you prefer? 😉
There was a problem hiding this comment.
I am happy to do it actually! I will have a go at it on Monday morning. Using the temp streamfile is also a good idea.
Signed-off-by: worksofliam <[email protected]>
Signed-off-by: worksofliam <[email protected]>
chrjorgensen
commented
Jan 31, 2025
julesyan
approved these changes
Jan 31, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Generate SQL output use the result set from the
QSYS2.GENERATE_SQLprocedure, but this is using a source member (in QTEMP) as intermediate storage and thus have a fixed length source line - 80 characters by default.This is a problem, since identifiers can be split by a linebreak.
An example is the generated source for view
QSYS2.OBJECT_LOCK_INFOwhere the lines containing the SELECT is broken in the middle of identifiers and functions:This can not be fixed by the SQL formatter, which will replace a linebreak in an identifier by a space:
This PR will change the use of the
QSYS2.GENERATE_SQLprocedure to generate a streamfile instead of a source member and read this file. This will eliminate the problem with linebreaks in identifiers:After SQL formatting the source will look as expected: