summaryrefslogtreecommitdiff
path: root/db/schema/vendorData.ts
diff options
context:
space:
mode:
Diffstat (limited to 'db/schema/vendorData.ts')
-rw-r--r--db/schema/vendorData.ts21
1 files changed, 20 insertions, 1 deletions
diff --git a/db/schema/vendorData.ts b/db/schema/vendorData.ts
index 048e5ef8..2739e8eb 100644
--- a/db/schema/vendorData.ts
+++ b/db/schema/vendorData.ts
@@ -238,11 +238,19 @@ import {
createdAt: timestamp("created_at", { withTimezone: true }),
updatedAt: timestamp("updated_at", { withTimezone: true }),
+<<<<<<< HEAD
});
export type ViewTagSubfields = typeof viewTagSubfields.$inferSelect;
export const vendorDataReportTemps = pgTable("vendor_data_report_temps", {
+=======
+})
+
+export type ViewTagSubfields = typeof viewTagSubfields.$inferSelect
+
+export const vendorDataReportTemps = pgTable("vendor_data_report_temps", {
+>>>>>>> dev
id: serial("id").primaryKey(),
contractItemId: integer("contract_item_id")
.notNull()
@@ -253,6 +261,7 @@ import {
fileName: varchar("file_name", { length: 255 }).notNull(),
filePath: varchar("file_path", { length: 1024 }).notNull(),
createdAt: timestamp("created_at", { withTimezone: true })
+<<<<<<< HEAD
.defaultNow()
.notNull(),
updatedAt: timestamp("updated_at", { withTimezone: true })
@@ -261,4 +270,14 @@ import {
});
export type VendorDataReportTemps = typeof vendorDataReportTemps.$inferSelect;
- \ No newline at end of file
+
+=======
+ .defaultNow()
+ .notNull(),
+ updatedAt: timestamp("updated_at", { withTimezone: true })
+ .defaultNow()
+ .notNull(),
+ });
+
+ export type VendorDataReportTemps = typeof vendorDataReportTemps.$inferSelect;
+>>>>>>> dev