Skip to content
Merged
Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"jsdoc/require-param-name": "error",
"jsdoc/require-param-type": "error",
"jsdoc/require-returns": "error",
"jsdoc/require-returns-type": "error"
"jsdoc/require-returns-type": "error",
"typescript/prefer-nullish-coalescing": "off"
},
"ignorePatterns": [
"**/*.config.*",
Expand Down
5 changes: 3 additions & 2 deletions forward_engineering/ddlProvider/ddlProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ const { joinActivatedAndDeactivatedStatements } = require('../utils/joinActivate
const { getIndexName } = require('./ddlHelpers/index/getIndexName.js');
const { getIndexType } = require('./ddlHelpers/index/getIndexType.js');
const { getIndexOptions } = require('./ddlHelpers/index/getIndexOptions.js');
const { getNumericValue } = require('../utils/general.js');

/**
* Format view columns as a string.
Expand Down Expand Up @@ -214,8 +215,8 @@ const hydrateColumn = ({ columnDefinition, jsonSchema, schemaData, definitionJso
default: columnDefinition.default,
comment: jsonSchema.refDescription ?? jsonSchema.description ?? definitionSchema.description,
isActivated: columnDefinition.isActivated,
scale: columnDefinition.scale,
precision: columnDefinition.precision,
scale: getNumericValue(columnDefinition.scale || jsonSchema.scale),
precision: getNumericValue(columnDefinition.precision || jsonSchema.precision),
length: columnDefinition.length,
schemaName: schemaData.schemaName,
fractSecPrecision: jsonSchema.fractSecPrecision,
Expand Down
3 changes: 3 additions & 0 deletions forward_engineering/types/ddlProvider.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ export type JsonSchemaColumn = {
collectionName?: string;
bucketName?: string;
properties?: Record<string, JsonSchemaColumn>;
scale?: number;
precision?: number;
length?: number;
};

export type CompositeKeyGroup = {
Expand Down
9 changes: 9 additions & 0 deletions forward_engineering/utils/general.js
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,14 @@ const getUpdatedProperties = (compMod, properties) => {
return updatedProperties;
};

/**
* Converts input into a number, if it's not valid - returns undefined.
*
* @param {unknown} prop Unknown input value
* @returns {number | undefined} .
*/
const getNumericValue = prop => (prop && !Number.isNaN(Number(prop)) ? Number(prop) : undefined);

module.exports = {
setTab,
hasType,
Expand All @@ -343,4 +351,5 @@ module.exports = {
getSchemaNameFromCollection,
getUpdatedProperties,
checkFieldPropertiesChanged,
getNumericValue,
};
Loading