diff options
Diffstat (limited to 'db/schema/vendorData.ts')
| -rw-r--r-- | db/schema/vendorData.ts | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/db/schema/vendorData.ts b/db/schema/vendorData.ts index 2739e8eb..01a10b7e 100644 --- a/db/schema/vendorData.ts +++ b/db/schema/vendorData.ts @@ -238,19 +238,11 @@ 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() @@ -261,7 +253,6 @@ export const vendorDataReportTemps = pgTable("vendor_data_report_temps", { 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 }) @@ -271,13 +262,3 @@ export const vendorDataReportTemps = pgTable("vendor_data_report_temps", { export type VendorDataReportTemps = typeof vendorDataReportTemps.$inferSelect; -======= - .defaultNow() - .notNull(), - updatedAt: timestamp("updated_at", { withTimezone: true }) - .defaultNow() - .notNull(), - }); - - export type VendorDataReportTemps = typeof vendorDataReportTemps.$inferSelect; ->>>>>>> dev |