Merge pull request #7022 from nocodb/fix/import-sanitization

fix: import sanitization

packages/nc-gui/components/dlg/QuickImport.vue

@@ -653,7 +653,7 @@ const onChange = () => {
 
             <a-form-item v-if="!importDataOnly" class="!my-2">
               <a-checkbox v-model:checked="importState.parserConfig.autoSelectFieldTypes">
-                <span class="caption">Auto-Select Field Types</span>
+                <span class="caption">{{ $t('labels.autoSelectFieldTypes') }}</span>
               </a-checkbox>
             </a-form-item>
 

packages/nc-gui/components/template/Editor.vue

@@ -535,6 +535,15 @@ async function importTemplate() {
           title: '',
           columns: table.columns || [],
         })
+
+        if (process.env.NC_SANITIZE_COLUMN_NAME !== 'false') {
+          // column_name could have been updated in tableCreate
+          // e.g. sanitize column name to something like field_1, field_2, and etc
+          createdTable.columns.forEach((column, i) => {
+            table.columns[i].column_name = column.column_name
+          })
+        }
+
         table.id = createdTable.id
         table.title = createdTable.title
 

packages/nc-gui/lang/en.json

@@ -591,6 +591,7 @@
     "goToDashboard": "Go to Dashboard",
     "importing": "Importing",
     "formatJson": "Format JSON",
+    "autoSelectFieldTypes": "Auto-Select Field Types",
     "firstRowAsHeaders": "Use First Record as Headers",
     "flattenNested": "Flatten Nested",
     "downloadAllowed": "Download allowed",

packages/noco-docs/docs/020.getting-started/050.self-hosted/020.environment-variables.md

@@ -69,3 +69,4 @@ For production use-cases, it is **recommended** to configure
 | NC_SECURE_ATTACHMENTS              | Allow accessing attachments only through presigned urls. To enable set value as `true` any other value treated as false. (⚠ this will make existing links inaccessible ⚠)                                                                   | `false`                                                                                        |
 | NC_ATTACHMENT_EXPIRE_SECONDS       | How many seconds before expiring presigned attachment urls. (Attachments will expire in at least set seconds and at most 10mins after set time)                                                                                             | 7200 (2 hours)                                                                                 |
 | NC_ALLOW_LOCAL_HOOKS               | To enable set value as `true` any other value treated as false. (⚠ this will allow webhooks to call local links which can raise security issues ⚠)                                                                                          | `false`                                                                                        |
+| NC_SANITIZE_COLUMN_NAME               | Sanitize the column name during column creation. To enable set value as `true` any other value treated as false.                                                                                        | `true`                                                                                        |

packages/nocodb/src/helpers/columnHelpers.ts

@@ -267,6 +267,7 @@ export async function populateRollupForLTAR({
 }
 
 export const sanitizeColumnName = (name: string) => {
+  if (process.env.NC_SANITIZE_COLUMN_NAME === 'false') return name;
   const columnName = name.replace(/\W/g, '_');
 
   // if column name only contains _ then return as 'field'

packages/nocodb/src/services/tables.service.ts

@@ -455,9 +455,21 @@ export class TablesService {
 
     const mxColumnLength = Column.getMaxColumnNameLength(sqlClientType);
 
+    const uniqueColumnNameCount = {};
+
     for (const column of param.table.columns) {
       if (!isVirtualCol(column)) {
         column.column_name = sanitizeColumnName(column.column_name);
+
+        if (uniqueColumnNameCount[column.column_name]) {
+          let suffix = 1;
+          let targetColumnName = `${column.column_name}_${suffix++}`;
+          while (uniqueColumnNameCount[targetColumnName]) {
+            targetColumnName = `${column.column_name}_${suffix++}`;
+          }
+          column.column_name = targetColumnName;
+        }
+        uniqueColumnNameCount[column.column_name] = 1;
       }
 
       if (column.column_name.length > mxColumnLength) {