From 3596d6c90d845fa95c648ca853aff07f4314513e Mon Sep 17 00:00:00 2001
From: emrberk <emreberk5699@gmail.com>
Date: Tue, 23 Sep 2025 19:15:48 +0300
Subject: [PATCH 1/6] fix(web-console): handle timestamp_ns format in CSV
 imports

---
 .../browser-tests/cypress/fixtures/nanos.csv  |  8 +++
 .../integration/console/import.spec.js        | 66 ++++++++++++++++++-
 packages/browser-tests/questdb                |  2 +-
 .../components/TableSchemaDialog/column.tsx   | 11 +++-
 .../src/components/TableSchemaDialog/const.ts |  1 -
 .../components/TableSchemaDialog/dialog.tsx   |  3 +-
 .../src/scenes/Import/ImportCSVFiles/const.ts |  1 +
 .../Import/ImportCSVFiles/file-status.tsx     |  2 +-
 .../scenes/Import/ImportCSVFiles/index.tsx    |  9 +--
 .../Import/ImportCSVFiles/upload-actions.tsx  |  1 +
 .../src/scenes/Import/ImportCSVFiles/utils.ts |  5 ++
 .../src/scenes/Schema/Row/index.tsx           |  4 +-
 .../src/utils/formatTableSchemaQuery.ts       |  3 +-
 13 files changed, 100 insertions(+), 16 deletions(-)
 create mode 100644 packages/browser-tests/cypress/fixtures/nanos.csv
 delete mode 100644 packages/web-console/src/components/TableSchemaDialog/const.ts

diff --git a/packages/browser-tests/cypress/fixtures/nanos.csv b/packages/browser-tests/cypress/fixtures/nanos.csv
new file mode 100644
index 000000000..123534ae2
--- /dev/null
+++ b/packages/browser-tests/cypress/fixtures/nanos.csv
@@ -0,0 +1,8 @@
+"timestamp","symbol","bids","asks"
+"2025-09-12T23:26:12.696868898Z","USDCHF","[[0.7938],[72902.0]]","[[0.7942],[75254.0]]"
+"2025-09-12T23:26:12.698402234Z","USDNOK","[[9.8337,9.8336],[56453.0,1.16831898E8]]","[[9.8341,9.8342],[64603.0,3.51343759E8]]"
+"2025-09-12T23:26:12.701577329Z","USDCHF","[[0.7938],[65290.0]]","[[0.7942],[57934.0]]"
+"2025-09-12T23:26:12.704578561Z","USDZAR","[[17.364],[53529.0]]","[[17.3644],[90619.0]]"
+"2025-09-12T23:26:12.704809736Z","AUDNZD","[[1.1168,1.1167],[63576.0,8.71920887E8]]","[[1.1172,1.1173],[66756.0,2.540549E7]]"
+"2025-09-12T23:26:12.706899510Z","USDHKD","[[7.778,7.7779],[91917.0,2.04926212E8]]","[[7.7784,7.7785],[68413.0,5.64775853E8]]"
+"2025-09-12T23:26:12.710846084Z","USDZAR","[[17.364,17.3639],[98866.0,6.3619799E8]]","[[17.3644,17.3645],[67646.0,8.68348153E8]]"
\ No newline at end of file
diff --git a/packages/browser-tests/cypress/integration/console/import.spec.js b/packages/browser-tests/cypress/integration/console/import.spec.js
index 8e85d51e6..8ad205521 100644
--- a/packages/browser-tests/cypress/integration/console/import.spec.js
+++ b/packages/browser-tests/cypress/integration/console/import.spec.js
@@ -1,17 +1,79 @@
 /// <reference types="cypress" />
 
 describe("questdb import", () => {
-  before(() => {
+  beforeEach(() => {
     cy.loadConsoleWithAuth();
   });
 
+  afterEach(() => {
+    cy.loadConsoleWithAuth();
+    cy.typeQuery("drop all tables;");
+    cy.runLine();
+    cy.getByDataHook("success-notification").should("be.visible");
+  });
+
   it("display import panel", () => {
     cy.getByDataHook("import-panel-button").click();
     cy.getByDataHook("import-dropbox").should("be.visible");
     cy.getByDataHook("import-browse-from-disk").should("be.visible");
 
-    cy.get('input[type="file"]').selectFile("cypress/fixtures/test.csv", { force: true });
+    cy.get('input[type="file"]').selectFile("cypress/fixtures/test.csv", {
+      force: true,
+    });
     cy.getByDataHook("import-table-column-schema").should("be.visible");
     cy.getByDataHook("import-table-column-owner").should("not.exist");
   });
+
+  it("should import csv with a nanosecond timestamp", () => {
+    cy.getByDataHook("import-panel-button").click();
+    cy.getByDataHook("import-dropbox").should("be.visible");
+    cy.getByDataHook("import-browse-from-disk").should("be.visible");
+
+    cy.get('input[type="file"]').selectFile("cypress/fixtures/nanos.csv", {
+      force: true,
+    });
+    cy.getByDataHook("import-table-column-schema").should("be.visible");
+    cy.getByDataHook("import-upload-button").should("be.enabled");
+    cy.getByDataHook("import-upload-button").click();
+
+    cy.getByDataHook("import-file-status").should("contain", "Imported 7 rows");
+    cy.getByDataHook("schema-table-title").should("contain", "nanos.csv");
+
+    cy.getByDataHook("schema-table-title").dblclick();
+    cy.getByDataHook("schema-folder-title").contains("Columns").dblclick();
+    cy.get('[data-id="questdb:expanded:tables:nanos.csv:columns:timestamp"]')
+      .should("be.visible")
+      .should("contain", "timestamp")
+      .should("contain", "TIMESTAMP_NS");
+    cy.getByDataHook("designated-timestamp-icon").should("not.exist");
+
+    cy.getByDataHook("table-schema-dialog-trigger")
+      .should("be.visible")
+      .should("contain", "4 cols");
+    cy.getByDataHook("table-schema-dialog-trigger").click();
+
+    cy.getByDataHook("create-table-panel").should("be.visible");
+    cy.getByDataHook("table-schema-dialog-column-0").should("be.visible");
+    cy.get("input[name='schemaColumns.0.name']").should(
+      "have.value",
+      "timestamp"
+    );
+
+    cy.get("select[name='schemaColumns.0.type']")
+      .get("option[value='TIMESTAMP_NS']")
+      .should("be.selected");
+
+    cy.getByDataHook("table-schema-dialog-column-0-designated-button").click();
+    cy.getByDataHook("form-submit-button").click();
+
+    cy.getByDataHook("create-table-panel").should("not.be.visible");
+
+    cy.get('select[name="overwrite"]').select("true");
+
+    cy.getByDataHook("import-upload-button").should("be.enabled");
+    cy.getByDataHook("import-upload-button").click();
+
+    cy.getByDataHook("import-file-status").should("contain", "Imported 7 rows");
+    cy.getByDataHook("designated-timestamp-icon").should("be.visible");
+  });
 });
diff --git a/packages/browser-tests/questdb b/packages/browser-tests/questdb
index 926556fb6..7f02ddd4f 160000
--- a/packages/browser-tests/questdb
+++ b/packages/browser-tests/questdb
@@ -1 +1 @@
-Subproject commit 926556fb65136bbdc6aa0e55ebbb296dd7961123
+Subproject commit 7f02ddd4fa5f27cb92839435c0b5240ae4b37758
diff --git a/packages/web-console/src/components/TableSchemaDialog/column.tsx b/packages/web-console/src/components/TableSchemaDialog/column.tsx
index 789a31fa8..a89a6d938 100644
--- a/packages/web-console/src/components/TableSchemaDialog/column.tsx
+++ b/packages/web-console/src/components/TableSchemaDialog/column.tsx
@@ -3,12 +3,14 @@ import { Form } from "../../components/Form"
 import {IconWithTooltip, Link, Text} from "../../components"
 import { Box } from "../../components/Box"
 import { Button } from "@questdb/react-components"
-import { DEFAULT_TIMESTAMP_FORMAT } from "./const"
+import { DEFAULT_TIMESTAMP_FORMAT, DEFAULT_TIMESTAMP_FORMAT_NS } from "../../scenes/Import/ImportCSVFiles/const"
 import styled from "styled-components"
 import { SchemaColumn } from "utils"
 import { Controls } from "./controls"
 import { Action } from "./types"
 import { DocsLink } from "./docs-link"
+import { isTimestamp } from "../../scenes/Import/ImportCSVFiles/utils"
+import { getTimestampFormat } from "../../scenes/Import/ImportCSVFiles/utils"
 
 const supportedColumnTypes: { label: string; value: string }[] = [
   { label: "AUTO", value: "" },
@@ -29,6 +31,7 @@ const supportedColumnTypes: { label: string; value: string }[] = [
   { label: "VARCHAR", value: "VARCHAR" },
   { label: "SYMBOL", value: "SYMBOL" },
   { label: "TIMESTAMP", value: "TIMESTAMP" },
+  { label: "TIMESTAMP_NS", value: "TIMESTAMP_NS" },
   { label: "UUID", value: "UUID" },
 ]
 
@@ -85,6 +88,7 @@ export const Column = ({
       key={column.name}
       odd={index % 2 !== 0}
       disabled={disabled}
+      data-hook={`table-schema-dialog-column-${index}`}
       onFocus={() => onFocus(index)}
     >
       <Index>
@@ -117,7 +121,7 @@ export const Column = ({
           </Form.Item>
         </Controls>
 
-        {column.type === "TIMESTAMP" && (
+        {isTimestamp(column.type) && (
           <Box flexDirection="column" gap="1rem">
             <TimestampControls>
               {action === "import" && (
@@ -128,7 +132,7 @@ export const Column = ({
                     defaultValue={
                       column.pattern !== ""
                         ? column.pattern
-                        : DEFAULT_TIMESTAMP_FORMAT
+                        : getTimestampFormat(column.type)
                     }
                     required
                   />
@@ -139,6 +143,7 @@ export const Column = ({
                 icon={
                   <Button
                     disabled={name === ""}
+                    data-hook={`table-schema-dialog-column-${index}-designated-button`}
                     skin={
                       timestamp !== "" &&
                       column.name !== "" &&
diff --git a/packages/web-console/src/components/TableSchemaDialog/const.ts b/packages/web-console/src/components/TableSchemaDialog/const.ts
deleted file mode 100644
index e8f529452..000000000
--- a/packages/web-console/src/components/TableSchemaDialog/const.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const DEFAULT_TIMESTAMP_FORMAT = "yyyy-MM-ddTHH:mm:ss.SSSUUUz"
diff --git a/packages/web-console/src/components/TableSchemaDialog/dialog.tsx b/packages/web-console/src/components/TableSchemaDialog/dialog.tsx
index 43db6fe0e..d3600ec3d 100644
--- a/packages/web-console/src/components/TableSchemaDialog/dialog.tsx
+++ b/packages/web-console/src/components/TableSchemaDialog/dialog.tsx
@@ -20,7 +20,7 @@ import { Panel } from "../../components/Panel"
 import { Actions } from "./actions"
 
 const StyledContentWrapper = styled(Drawer.ContentWrapper)`
-  --columns: auto 120px; /* magic numbers to fit input, type dropdown and remove button nicely */
+  --columns: auto 140px; /* magic numbers to fit input, type dropdown and remove button nicely */
 `
 
 const Items = styled(Box).attrs({ gap: "0", flexDirection: "column" })`
@@ -185,6 +185,7 @@ export const Dialog = ({
       trigger={
         trigger ?? (
           <Button
+            data-hook="table-schema-dialog-trigger"
             skin={columnCount > 0 ? "transparent" : "secondary"}
             prefixIcon={
               columnCount > 0 ? <Edit size="18px" /> : <TableIcon size="18px" />
diff --git a/packages/web-console/src/scenes/Import/ImportCSVFiles/const.ts b/packages/web-console/src/scenes/Import/ImportCSVFiles/const.ts
index 5a5a7dad8..74ed449e7 100644
--- a/packages/web-console/src/scenes/Import/ImportCSVFiles/const.ts
+++ b/packages/web-console/src/scenes/Import/ImportCSVFiles/const.ts
@@ -1,2 +1,3 @@
 export const DEFAULT_TIMESTAMP_FORMAT = "yyyy-MM-ddTHH:mm:ss.SSSUUUz"
+export const DEFAULT_TIMESTAMP_FORMAT_NS = "yyyy-MM-ddTHH:mm:ss.SSSUUUNNNz"
 export const MAX_UNCOMMITTED_ROWS = 500000
diff --git a/packages/web-console/src/scenes/Import/ImportCSVFiles/file-status.tsx b/packages/web-console/src/scenes/Import/ImportCSVFiles/file-status.tsx
index 756edd5c0..ec9116dbe 100644
--- a/packages/web-console/src/scenes/Import/ImportCSVFiles/file-status.tsx
+++ b/packages/web-console/src/scenes/Import/ImportCSVFiles/file-status.tsx
@@ -73,7 +73,7 @@ const mapStatusToLabel = (
 export const FileStatus = ({ file }: { file: ProcessedFile }) => {
   const mappedStatus = mapStatusToLabel(file)
   return mappedStatus ? (
-    <Box gap="1rem" align="flex-start" flexDirection="column">
+    <Box gap="1rem" align="flex-start" flexDirection="column" data-hook="import-file-status">
       <Badge type={mappedStatus.type}>
         <StyledBox>
           {mappedStatus.icon} {mappedStatus.label}
diff --git a/packages/web-console/src/scenes/Import/ImportCSVFiles/index.tsx b/packages/web-console/src/scenes/Import/ImportCSVFiles/index.tsx
index 226d01c27..cf0353049 100644
--- a/packages/web-console/src/scenes/Import/ImportCSVFiles/index.tsx
+++ b/packages/web-console/src/scenes/Import/ImportCSVFiles/index.tsx
@@ -10,7 +10,8 @@ import { pick, UploadResult, FileCheckStatus, Parameter } from "../../../utils"
 import * as QuestDB from "../../../utils/questdb"
 import { useSelector } from "react-redux"
 import { selectors } from "../../../store"
-import { DEFAULT_TIMESTAMP_FORMAT, MAX_UNCOMMITTED_ROWS } from "./const"
+import { getTimestampFormat, isTimestamp } from "./utils"
+import { MAX_UNCOMMITTED_ROWS } from "./const"
 import { useIsVisible } from "../../../components"
 import {
   extractPrecionFromGeohash,
@@ -123,7 +124,7 @@ export const ImportCSVFiles = ({ onViewData, onUpload }: Props) => {
                   return columnResponse.data.map((column) => ({
                     name: column.column,
                     type: mapColumnTypeToUI(column.type),
-                    pattern: DEFAULT_TIMESTAMP_FORMAT,
+                    pattern: getTimestampFormat(column.type),
                     precision: isGeoHash(column.type)
                       ? extractPrecionFromGeohash(column.type)
                       : "",
@@ -273,10 +274,10 @@ export const ImportCSVFiles = ({ onViewData, onUpload }: Props) => {
                           ...{
                             type: mapColumnTypeToUI(c.type),
                             pattern:
-                              c.type === "TIMESTAMP"
+                              isTimestamp(c.type)
                                 ? match?.pattern
                                   ? match?.pattern
-                                  : DEFAULT_TIMESTAMP_FORMAT
+                                  : getTimestampFormat(c.type)
                                 : "",
                             precision: isGeoHash(c.type)
                               ? extractPrecionFromGeohash(c.type)
diff --git a/packages/web-console/src/scenes/Import/ImportCSVFiles/upload-actions.tsx b/packages/web-console/src/scenes/Import/ImportCSVFiles/upload-actions.tsx
index ff3b3c655..350217e30 100644
--- a/packages/web-console/src/scenes/Import/ImportCSVFiles/upload-actions.tsx
+++ b/packages/web-console/src/scenes/Import/ImportCSVFiles/upload-actions.tsx
@@ -31,6 +31,7 @@ export const UploadActions = ({
       />
       <Button
         disabled={file.isUploading}
+        data-hook="import-upload-button"
         skin="primary"
         prefixIcon={<Upload2 size="18px" />}
         onClick={() => onUpload(file.id)}
diff --git a/packages/web-console/src/scenes/Import/ImportCSVFiles/utils.ts b/packages/web-console/src/scenes/Import/ImportCSVFiles/utils.ts
index e809d4d58..c0d3b1da7 100644
--- a/packages/web-console/src/scenes/Import/ImportCSVFiles/utils.ts
+++ b/packages/web-console/src/scenes/Import/ImportCSVFiles/utils.ts
@@ -1,4 +1,5 @@
 import { SchemaColumn } from "components/TableSchemaDialog/types"
+import { DEFAULT_TIMESTAMP_FORMAT, DEFAULT_TIMESTAMP_FORMAT_NS } from "./const"
 
 export const isGeoHash = (type: string) => type.startsWith("GEOHASH")
 
@@ -6,6 +7,10 @@ const arrayRegex = /^[a-z][a-z0-9]*(\[\])+$/i
 
 export const isArray = (type: string) => arrayRegex.test(type)
 
+export const isTimestamp = (type: string) => ["TIMESTAMP", "TIMESTAMP_NS"].includes(type)
+
+export const getTimestampFormat = (type: string) => type === "TIMESTAMP_NS" ? DEFAULT_TIMESTAMP_FORMAT_NS : DEFAULT_TIMESTAMP_FORMAT
+
 export const extractPrecionFromGeohash = (geohash: string) => {
   const regex = /\(([^)]+)\)/g
   const matches = regex.exec(geohash)
diff --git a/packages/web-console/src/scenes/Schema/Row/index.tsx b/packages/web-console/src/scenes/Schema/Row/index.tsx
index 34f3367a0..029393750 100644
--- a/packages/web-console/src/scenes/Schema/Row/index.tsx
+++ b/packages/web-console/src/scenes/Schema/Row/index.tsx
@@ -212,7 +212,7 @@ const TYPE_ICONS = {
     icon: Tag
   },
   time: {
-    types: ["TIMESTAMP", "INTERVAL"],
+    types: ["TIMESTAMP", "INTERVAL", "TIMESTAMP_NS"],
     icon: SortDown
   },
   network: {
@@ -255,7 +255,7 @@ const ColumnIcon = ({
   if (isDesignatedTimestamp) {
     return (
       <IconWithTooltip
-        icon={<SortDownIcon size="14px" />}
+        icon={<SortDownIcon data-hook="designated-timestamp-icon" size="14px" />}
         placement="top"
         tooltip="Designated timestamp"
       />
diff --git a/packages/web-console/src/utils/formatTableSchemaQuery.ts b/packages/web-console/src/utils/formatTableSchemaQuery.ts
index c192dc58f..f5cf2055a 100644
--- a/packages/web-console/src/utils/formatTableSchemaQuery.ts
+++ b/packages/web-console/src/utils/formatTableSchemaQuery.ts
@@ -1,5 +1,6 @@
 import { trim } from "ramda"
 import { formatSql } from "../utils"
+import { isTimestamp } from "../scenes/Import/ImportCSVFiles/utils"
 
 type Column = {
   column: string
@@ -35,7 +36,7 @@ export const formatTableSchemaQuery = ({
 }: Props) => {
   const hasValidTimestamp =
     timestamp &&
-    schemaColumns.find((c) => c.column === timestamp && c.type === "TIMESTAMP")
+    schemaColumns.find((c) => c.column === timestamp && isTimestamp(c.type))
 
   let query = `CREATE TABLE '${name}' (`
 

From 0629e8b1fa8decf4c5c8fda31221098b6ae99f6a Mon Sep 17 00:00:00 2001
From: emrberk <emreberk5699@gmail.com>
Date: Wed, 24 Sep 2025 11:26:13 +0300
Subject: [PATCH 2/6] proxy imp in server-dist.js

---
 packages/web-console/serve-dist.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/web-console/serve-dist.js b/packages/web-console/serve-dist.js
index 408dc4d91..a1a5fe2c9 100644
--- a/packages/web-console/serve-dist.js
+++ b/packages/web-console/serve-dist.js
@@ -21,7 +21,8 @@ const server = http.createServer((req, res) => {
     reqPathName.startsWith("/exec") ||
     reqPathName.startsWith("/settings") ||
     reqPathName.startsWith("/warnings") ||
-    reqPathName.startsWith("/chk")
+    reqPathName.startsWith("/chk") ||
+    reqPathName.startsWith("/imp")
   ) {
     // proxy /exec requests to localhost:9000
     const options = {

From fe6da514553a3c284ee1e6e2d14b7f1a437bc8e7 Mon Sep 17 00:00:00 2001
From: emrberk <emreberk5699@gmail.com>
Date: Wed, 24 Sep 2025 11:27:06 +0300
Subject: [PATCH 3/6] submodule

---
 packages/browser-tests/questdb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/browser-tests/questdb b/packages/browser-tests/questdb
index 7f02ddd4f..700fdca94 160000
--- a/packages/browser-tests/questdb
+++ b/packages/browser-tests/questdb
@@ -1 +1 @@
-Subproject commit 7f02ddd4fa5f27cb92839435c0b5240ae4b37758
+Subproject commit 700fdca9461cc4c6631e7b8c198f14afb817fb04

From 0bd0fb19c203792287b876d4324658b1c88000f2 Mon Sep 17 00:00:00 2001
From: emrberk <emreberk5699@gmail.com>
Date: Wed, 24 Sep 2025 11:49:49 +0300
Subject: [PATCH 4/6] let's type the clear statement directly

---
 .../browser-tests/cypress/integration/console/import.spec.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/browser-tests/cypress/integration/console/import.spec.js b/packages/browser-tests/cypress/integration/console/import.spec.js
index 8ad205521..87d51997b 100644
--- a/packages/browser-tests/cypress/integration/console/import.spec.js
+++ b/packages/browser-tests/cypress/integration/console/import.spec.js
@@ -7,9 +7,10 @@ describe("questdb import", () => {
 
   afterEach(() => {
     cy.loadConsoleWithAuth();
-    cy.typeQuery("drop all tables;");
-    cy.runLine();
+    cy.typeQueryDirectly("drop all tables;");
+    cy.clickRunIconInLine(1);
     cy.getByDataHook("success-notification").should("be.visible");
+    cy.clearEditor();
   });
 
   it("display import panel", () => {

From 401d108ff5d8c6e2bf75bf09042f6eb98b8bc169 Mon Sep 17 00:00:00 2001
From: emrberk <emreberk5699@gmail.com>
Date: Wed, 24 Sep 2025 17:39:19 +0300
Subject: [PATCH 5/6] change label to dataset pattern

---
 .../web-console/src/components/TableSchemaDialog/column.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-console/src/components/TableSchemaDialog/column.tsx b/packages/web-console/src/components/TableSchemaDialog/column.tsx
index a89a6d938..3784019f1 100644
--- a/packages/web-console/src/components/TableSchemaDialog/column.tsx
+++ b/packages/web-console/src/components/TableSchemaDialog/column.tsx
@@ -128,7 +128,7 @@ export const Column = ({
                 <Form.Item name={`schemaColumns.${index}.pattern`}>
                   <Form.Input
                     name={`schemaColumns.${index}.pattern`}
-                    placeholder="Pattern"
+                    placeholder="Dataset pattern"
                     defaultValue={
                       column.pattern !== ""
                         ? column.pattern

From 170a00fcf552af3374d3e0253614ebb95da7accb Mon Sep 17 00:00:00 2001
From: emrberk <emreberk5699@gmail.com>
Date: Wed, 24 Sep 2025 19:05:47 +0300
Subject: [PATCH 6/6] submodule

---
 packages/browser-tests/questdb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/browser-tests/questdb b/packages/browser-tests/questdb
index 700fdca94..c113299ed 160000
--- a/packages/browser-tests/questdb
+++ b/packages/browser-tests/questdb
@@ -1 +1 @@
-Subproject commit 700fdca9461cc4c6631e7b8c198f14afb817fb04
+Subproject commit c113299ed19ad020bc57415ef00658a2a17af147