Skip to content
Merged
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions forward_engineering/ddlProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,6 @@ module.exports = (baseProvider, options, app) => {
createView(viewData, dbData, isActivated) {
const orReplace = preSpace(viewData.orReplace && 'OR REPLACE');
const ifNotExist = preSpace(viewData.ifNotExist && 'IF NOT EXISTS');
const schemaName = get(viewData, 'schemaData.schemaName');
const { columnList, tableColumns, tables } = viewData.keys.reduce(
(result, key) => {
result.columnList.push({
Expand Down Expand Up @@ -649,7 +648,7 @@ module.exports = (baseProvider, options, app) => {
ifNotExist,
secure: preSpace(viewData.secure && 'SECURE'),
materialized: preSpace(viewData.materialized && 'MATERIALIZED'),
name: getFullName(schemaName, viewData.name),
name: viewData.fullName,
column_list: viewColumnsToString(columnList, isActivated),
copy_grants: viewData.copyGrants ? 'COPY GRANTS\n' : '',
comment: viewData.comment ? `COMMENT=${escapeString(scriptFormat, viewData.comment)}\n` : '',
Expand Down Expand Up @@ -721,7 +720,7 @@ module.exports = (baseProvider, options, app) => {
return {
schemaName: getName(containerData.isCaseSensitive, containerData.name),
isCaseSensitive: containerData.isCaseSensitive,
databaseName: containerData.database,
databaseName: getName(containerData.isCaseSensitive, containerData.database),
comment: containerData.description,
transient: containerData.transient,
managedAccess: containerData.managedAccess,
Expand Down Expand Up @@ -1013,7 +1012,7 @@ module.exports = (baseProvider, options, app) => {
const firstTab = entityData[0];
const { databaseName, schemaName } = viewData.schemaData;
const viewName = getName(firstTab.isCaseSensitive, viewData.name);
const fullName = getFullName(databaseName, getFullName(schemaName, viewName));
const fullName = getFullName(getFullName(databaseName, schemaName), viewName);

return {
...viewData,
Expand Down