Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use system names for libraries and source files in SQL #2324

Merged
merged 2 commits into from
Nov 1, 2024
Merged

Use system names for libraries and source files in SQL #2324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a27702c
Use system names for libraries and source files in SQL
chrjorgensen Nov 1, 2024
329f373
Add test for long library names
chrjorgensen Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 21 additions & 22 deletions src/api/IBMiContent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ export default class IBMiContent {
` t.ROW_LENGTH as SOURCE_LENGTH,`,
` t.IASP_NUMBER as IASP_NUMBER`,
`from QSYS2.SYSTABLES as t`,
`where t.table_schema = '${americanLibrary}' and t.file_type = 'S'${objectNameLike()}`,
`where t.SYSTEM_TABLE_SCHEMA = '${americanLibrary}' and t.FILE_TYPE = 'S'${objectNameLike()}`,
];
} else if (!withSourceFiles) {
//DSPOBJD only
Expand All @@ -537,14 +537,14 @@ export default class IBMiContent {
createOBJLIST = [
`with SRCPF as (`,
` select `,
` Replace(Replace(Replace(t.SYSTEM_TABLE_NAME, '${this.ibmi.variantChars.american[2]}','${this.ibmi.variantChars.local[2]}'), '${this.ibmi.variantChars.american[1]}', '${this.ibmi.variantChars.local[1]}'), '${this.ibmi.variantChars.american[0]}', '${this.ibmi.variantChars.local[0]}') as NAME,`,
` replace(replace(replace(t.SYSTEM_TABLE_NAME, '${this.ibmi.variantChars.american[2]}','${this.ibmi.variantChars.local[2]}'), '${this.ibmi.variantChars.american[1]}', '${this.ibmi.variantChars.local[1]}'), '${this.ibmi.variantChars.american[0]}', '${this.ibmi.variantChars.local[0]}') as NAME,`,
` '*FILE' as TYPE,`,
` 'PF' as ATTRIBUTE,`,
` t.TABLE_TEXT as TEXT,`,
` 1 as IS_SOURCE,`,
` t.ROW_LENGTH as SOURCE_LENGTH`,
` from QSYS2.SYSTABLES as t`,
` where t.table_schema = '${americanLibrary}' and t.file_type = 'S'${objectNameLike()}`,
` where t.SYSTEM_TABLE_SCHEMA = '${americanLibrary}' and t.FILE_TYPE = 'S'${objectNameLike()}`,
`), OBJD as (`,
` select `,
` OBJNAME as NAME,`,
Expand Down Expand Up @@ -626,29 +626,28 @@ export default class IBMiContent {
const singleMemberExtension = memberExtensionFilter.noFilter && filter.extensions && !filter.extensions.includes(",") ? this.ibmi.upperCaseName(filter.extensions).replace(/[*]/g, `%`) : undefined;

const statement =
`With MEMBERS As (
SELECT
rtrim(cast(a.system_table_schema as char(10) for bit data)) as LIBRARY,
b.avgrowsize as RECORD_LENGTH,
a.iasp_number as ASP,
rtrim(cast(a.system_table_name as char(10) for bit data)) AS SOURCE_FILE,
rtrim(cast(b.system_table_member as char(10) for bit data)) as NAME,
coalesce(rtrim(cast(b.source_type as varchar(10) for bit data)), '') as TYPE,
coalesce(rtrim(varchar(b.partition_text)), '') as TEXT,
`with MEMBERS as (
select
rtrim(cast(a.SYSTEM_TABLE_SCHEMA as char(10) for bit data)) as LIBRARY,
b.AVGROWSIZE as RECORD_LENGTH,
a.IASP_NUMBER as ASP,
rtrim(cast(a.SYSTEM_TABLE_NAME as char(10) for bit data)) AS SOURCE_FILE,
rtrim(cast(b.SYSTEM_TABLE_MEMBER as char(10) for bit data)) as NAME,
coalesce(rtrim(cast(b.SOURCE_TYPE as varchar(10) for bit data)), '') as TYPE,
coalesce(rtrim(varchar(b.PARTITION_TEXT)), '') as TEXT,
b.NUMBER_ROWS as LINES,
extract(epoch from (b.CREATE_TIMESTAMP))*1000 as CREATED,
extract(epoch from (b.LAST_SOURCE_UPDATE_TIMESTAMP))*1000 as CHANGED
FROM qsys2.systables AS a
JOIN qsys2.syspartitionstat AS b
ON b.table_schema = a.table_schema AND
b.table_name = a.table_name
from QSYS2.SYSTABLES as a
join QSYS2.SYSPARTITIONSTAT as b
on ( b.SYSTEM_TABLE_SCHEMA, b.SYSTEM_TABLE_NAME ) = ( a.SYSTEM_TABLE_SCHEMA, a.SYSTEM_TABLE_NAME )
)
Select * From MEMBERS
Where LIBRARY = '${this.ibmi.sysNameInAmerican(library)}'
${sourceFile !== `*ALL` ? `And SOURCE_FILE = '${this.ibmi.sysNameInAmerican(sourceFile)}'` : ``}
${singleMember ? `And NAME Like '${this.ibmi.sysNameInAmerican(singleMember)}'` : ''}
${singleMemberExtension ? `And TYPE Like '${this.ibmi.sysNameInAmerican(singleMemberExtension)}'` : ''}
Order By ${sort.order === 'name' ? 'NAME' : 'CHANGED'} ${!sort.ascending ? 'DESC' : 'ASC'}`;
select * from MEMBERS
where LIBRARY = '${this.ibmi.sysNameInAmerican(library)}'
${sourceFile !== `*ALL` ? `and SOURCE_FILE = '${this.ibmi.sysNameInAmerican(sourceFile)}'` : ``}
${singleMember ? `and NAME like '${this.ibmi.sysNameInAmerican(singleMember)}'` : ''}
${singleMemberExtension ? `and TYPE like '${this.ibmi.sysNameInAmerican(singleMemberExtension)}'` : ''}
order by ${sort.order === 'name' ? 'NAME' : 'CHANGED'} ${!sort.ascending ? 'DESC' : 'ASC'}`;

const results = await this.ibmi.runSQL(statement);
if (results.length) {
Expand Down
7 changes: 5 additions & 2 deletions src/filesystems/qsys/extendedContent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,14 @@ export class ExtendedIBMiContent {
let recordLength: number = DEFAULT_RECORD_LENGTH;

if (content) {
const result = await content.runSQL(`SELECT LENGTH(srcdta) as LENGTH FROM ${aliasPath} limit 1`);
const result = await content.runSQL(`select length(SRCDTA) as LENGTH from ${aliasPath} limit 1`);
if (result.length > 0) {
recordLength = Number(result[0].LENGTH);
} else {
const result = await content.runSQL(`SELECT row_length-12 as LENGTH FROM QSYS2.SYSTABLES WHERE TABLE_SCHEMA = '${lib}' and TABLE_NAME = '${spf}' limit 1`);
const result = await content.runSQL(`select row_length-12 as LENGTH
from QSYS2.SYSTABLES
where SYSTEM_TABLE_SCHEMA = '${lib}' and SYSTEM_TABLE_NAME = '${spf}'
limit 1`);
if (result.length > 0) {
recordLength = Number(result[0].LENGTH);
}
Expand Down
30 changes: 30 additions & 0 deletions src/testing/content.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,36 @@ export const ContentSuite: TestSuite = {
}
}
}
},
{
name: `Test long library name`, test: async () => {
const connection = instance.getConnection()!;
const content = instance.getContent()!;
const longName = Tools.makeid(18);
const shortName = Tools.makeid(8);
const createLib = await connection.runCommand({ command: `RUNSQL 'create schema "${longName}" for ${shortName}' commit(*none)`, noLibList: true });
if (createLib.code === 0) {
await connection!.runCommand({ command: `CRTSRCPF FILE(${shortName}/SFILE) MBR(MBR) TEXT('Test long library name')` });

const libraries = await content?.getLibraries({ library: `${shortName}` })
assert.strictEqual(libraries?.length, 1);

const objects = await content?.getObjectList({ library: `${shortName}`, types: [`*SRCPF`], object: `SFILE` });
assert.strictEqual(objects?.length, 1);
assert.strictEqual(objects[0].type, `*FILE`);
assert.strictEqual(objects[0].text, `Test long library name`);

const memberCount = await content.countMembers({ library: `${shortName}`, name: `SFILE` });
assert.strictEqual(memberCount, 1);
const members = await content?.getMemberList({ library: `${shortName}`, sourceFile: `SFILE` });

assert.strictEqual(members?.length, 1);

await connection.runCommand({ command: `RUNSQL 'drop schema "${longName}"' commit(*none)`, noLibList: true });
} else {
throw new Error(`Failed to create schema "${longName}"`);
}
}
}
]
};