fix postgres timestamps

docker/ubuntu/Dockerfile

@@ -22,17 +22,18 @@ RUN apt install -y \
 # ca-certificates... for https
 # libpcre3-dev... for nim regex
 
+WORKDIR /root
+
 # Nim
 ARG NIM_VERSION="2.0.0"
-WORKDIR /root
 RUN curl https://nim-lang.org/choosenim/init.sh -o init.sh
 RUN sh init.sh -y
 RUN rm -f init.sh
 ENV PATH $PATH:/root/.nimble/bin
 RUN choosenim ${NIM_VERSION}
 
 # nimlangserver
-WORKDIR /root
+# https://github.com/nim-lang/langserver/releases
 RUN curl -o nimlangserver.tar.gz -L https://github.com/nim-lang/langserver/releases/download/v1.6.0/nimlangserver-1.6.0-linux-amd64.tar.gz
 RUN tar zxf nimlangserver.tar.gz
 RUN rm -f nimlangserver.tar.gz

src/allographer/v1/schema_builder/models/column.nim

@@ -11,6 +11,7 @@ type Column* = ref object
   isUnique*: bool
   isAutoIncrement*:bool
   isDefault*: bool
+  isUpdatedAt*: bool
   defaultBool*: bool
   defaultInt*: int
   defaultFloat*: float
@@ -41,6 +42,7 @@ proc toSchema*(self:Column):JsonNode =
     "isUnique": self.isUnique,
     "isAutoIncrement": self.isAutoIncrement,
     "isDefault": self.isDefault,
+    "isUpdatedAt": self.isUpdatedAt,
     "defaultBool": self.defaultBool,
     "defaultInt": self.defaultInt,
     "defaultFloat": self.defaultFloat,

src/allographer/v1/schema_builder/queries/postgres/create_table.nim

@@ -16,6 +16,7 @@ proc createTable*(self: PostgresSchema, isReset:bool) =
   var query = ""
   var foreignQuery = ""
   var indexQuery:seq[string] = @[]
+  var updatedAtQuery:seq[string] = @[]
 
   for i, column in self.table.columns:
     if query.len > 0: query.add(", ")
@@ -28,6 +29,9 @@ proc createTable*(self: PostgresSchema, isReset:bool) =
     if column.isIndex:
       indexQuery.add(createIndexString(self.table, column))
 
+    if column.isUpdatedAt:
+      updatedAtQuery.add(createUpdatedAtString(self.table, column))
+
   if self.table.primary.len > 0:
     let primary = self.table.primary.map(
         proc(row:string):string =
@@ -48,6 +52,9 @@ proc createTable*(self: PostgresSchema, isReset:bool) =
   if indexQuery.len > 0:
     queries.add(indexQuery)
 
+  if updatedAtQuery.len > 0:
+    queries.add(updatedAtQuery)
+
   let schema = $self.table.toSchema()
   let checksum = $schema.secureHash()
 

src/allographer/v1/schema_builder/queries/postgres/sub/add_column_query.nim

@@ -400,6 +400,23 @@ proc addForeignKey(column:Column, table:Table):string =
   return &"ALTER TABLE \"{table.name}\" ADD FOREIGN KEY (\"{column.name}\") REFERENCES \"{refTable}\"(\"{refColumn}\") ON DELETE {onDeleteString}"
 
 
+proc addUpdatedAtColumn(column:Column, table:Table):seq[string] =
+  return @[
+    &"""CREATE OR REPLACE FUNCTION {table.name}_updated_at_column()
+    RETURNS TRIGGER AS $$
+    BEGIN
+        NEW.updated_at = CURRENT_TIMESTAMP;
+        RETURN NEW;
+    END;
+    $$ LANGUAGE plpgsql;""",
+
+    &"""CREATE TRIGGER set_{table.name}_updated_at
+    BEFORE UPDATE ON "{table.name}"
+    FOR EACH ROW
+    EXECUTE FUNCTION {table.name}_updated_at_column();"""
+  ]
+
+
 proc addIndexColumn(column:Column, table:Table):string =
   return &"CREATE INDEX IF NOT EXISTS \"{table.name}_{column.name}_index\" ON \"{table.name}\"(\"{column.name}\")"
 
@@ -472,4 +489,7 @@ proc addColumnString*(table:Table, column:Column):seq[string] =
   if column.isIndex:
     queries.add(column.addIndexColumn(table))
 
+  if column.isUpdatedAt:
+    queries.add(column.addUpdatedAtColumn(table))
+
   return queries

src/allographer/v1/schema_builder/queries/postgres/sub/create_column_query.nim

@@ -247,8 +247,8 @@ proc createTimestampColumn(column:Column, table:Table):string =
 
 
 proc createTimestampsColumn(column:Column, table:Table):string =
-  result = "\"created_at\" TIMESTAMP, "
-  result.add("\"updated_at\" TIMESTAMP DEFAULT (NOW())")
+  result = "\"created_at\" TIMESTAMP DEFAULT CURRENT_TIMESTAMP, "
+  result.add("\"updated_at\" TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 
 
 proc createSoftDeleteColumn(column:Column, table:Table):string =
@@ -370,6 +370,23 @@ proc indexColumn(column:Column, table:Table):string =
   return &"CREATE INDEX IF NOT EXISTS \"{table.name}_{column.name}_index\" ON \"{table.name}\"(\"{column.name}\")"
 
 
+proc updatedAtColumn(column:Column, table:Table):seq[string] =
+  return @[
+    &"""CREATE OR REPLACE FUNCTION {table.name}_updated_at_column()
+    RETURNS TRIGGER AS $$
+    BEGIN
+        NEW.updated_at = CURRENT_TIMESTAMP;
+        RETURN NEW;
+    END;
+    $$ LANGUAGE plpgsql;""",
+
+    &"""CREATE TRIGGER set_{table.name}_updated_at
+    BEFORE UPDATE ON "{table.name}"
+    FOR EACH ROW
+    EXECUTE FUNCTION {table.name}_updated_at_column();"""
+  ]
+
+
 proc createColumnString*(table:Table, column:Column):string =
   case column.typ:
     # int
@@ -439,3 +456,6 @@ proc createForeignString*(table:Table, column:Column):string =
 
 proc createIndexString*(table:Table, column:Column):string =
   return column.indexColumn(table)
+
+proc createUpdatedAtString*(table:Table, column:Column):seq[string] =
+  return column.updatedAtColumn(table)

src/allographer/v2/schema_builder/models/column.nim

@@ -11,6 +11,7 @@ type Column* = ref object
   isUnique*: bool
   isAutoIncrement*:bool
   isDefault*: bool
+  isUpdatedAt*: bool
   defaultBool*: bool
   defaultInt*: int
   defaultFloat*: float
@@ -41,6 +42,7 @@ proc toSchema*(self:Column):JsonNode =
     "isUnique": self.isUnique,
     "isAutoIncrement": self.isAutoIncrement,
     "isDefault": self.isDefault,
+    "isUpdatedAt": self.isUpdatedAt,
     "defaultBool": self.defaultBool,
     "defaultInt": self.defaultInt,
     "defaultFloat": self.defaultFloat,
@@ -208,6 +210,7 @@ proc timestamp*(_:type Column, name:string):Column =
 proc timestamps*(_:type Column):Column =
   let column = Column.new()
   column.typ = rdbTimestamps
+  column.isUpdatedAt = true
   return column
 
 

src/allographer/v2/schema_builder/queries/postgres/create_table.nim

@@ -16,6 +16,7 @@ proc createTable*(self: PostgresSchema, isReset:bool) =
   var query = ""
   var foreignQuery = ""
   var indexQuery:seq[string] = @[]
+  var updatedAtQuery:seq[string] = @[]
 
   for i, column in self.table.columns:
     if query.len > 0: query.add(", ")
@@ -28,6 +29,9 @@ proc createTable*(self: PostgresSchema, isReset:bool) =
     if column.isIndex:
       indexQuery.add(createIndexString(self.table, column))
 
+    if column.isUpdatedAt:
+      updatedAtQuery.add(createUpdatedAtString(self.table, column))
+
   if self.table.primary.len > 0:
     let primary = self.table.primary.map(
         proc(row:string):string =
@@ -48,6 +52,9 @@ proc createTable*(self: PostgresSchema, isReset:bool) =
   if indexQuery.len > 0:
     queries.add(indexQuery)
 
+  if updatedAtQuery.len > 0:
+    queries.add(updatedAtQuery)
+
   let schema = $self.table.toSchema()
   let checksum = $schema.secureHash()
 

src/allographer/v2/schema_builder/queries/postgres/sub/add_column_query.nim

@@ -400,6 +400,23 @@ proc addForeignKey(column:Column, table:Table):string =
   return &"ALTER TABLE \"{table.name}\" ADD FOREIGN KEY (\"{column.name}\") REFERENCES \"{refTable}\"(\"{refColumn}\") ON DELETE {onDeleteString}"
 
 
+proc addUpdatedAtColumn(column:Column, table:Table):seq[string] =
+  return @[
+    &"""CREATE OR REPLACE FUNCTION {table.name}_updated_at_column()
+    RETURNS TRIGGER AS $$
+    BEGIN
+        NEW.updated_at = CURRENT_TIMESTAMP;
+        RETURN NEW;
+    END;
+    $$ LANGUAGE plpgsql;""",
+
+    &"""CREATE TRIGGER set_{table.name}_updated_at
+    BEFORE UPDATE ON "{table.name}"
+    FOR EACH ROW
+    EXECUTE FUNCTION {table.name}_updated_at_column();"""
+  ]
+
+
 proc addIndexColumn(column:Column, table:Table):string =
   return &"CREATE INDEX IF NOT EXISTS \"{table.name}_{column.name}_index\" ON \"{table.name}\"(\"{column.name}\")"
 
@@ -472,4 +489,7 @@ proc addColumnString*(table:Table, column:Column):seq[string] =
   if column.isIndex:
     queries.add(column.addIndexColumn(table))
 
+  if column.isUpdatedAt:
+    queries.add(column.addUpdatedAtColumn(table))
+
   return queries

src/allographer/v2/schema_builder/queries/postgres/sub/create_column_query.nim

@@ -247,8 +247,8 @@ proc createTimestampColumn(column:Column, table:Table):string =
 
 
 proc createTimestampsColumn(column:Column, table:Table):string =
-  result = "\"created_at\" TIMESTAMP, "
-  result.add("\"updated_at\" TIMESTAMP DEFAULT (NOW())")
+  result = "\"created_at\" TIMESTAMP DEFAULT CURRENT_TIMESTAMP, "
+  result.add("\"updated_at\" TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 
 
 proc createSoftDeleteColumn(column:Column, table:Table):string =
@@ -370,6 +370,23 @@ proc indexColumn(column:Column, table:Table):string =
   return &"CREATE INDEX IF NOT EXISTS \"{table.name}_{column.name}_index\" ON \"{table.name}\"(\"{column.name}\")"
 
 
+proc updatedAtColumn(column:Column, table:Table):seq[string] =
+  return @[
+    &"""CREATE OR REPLACE FUNCTION {table.name}_updated_at_column()
+    RETURNS TRIGGER AS $$
+    BEGIN
+        NEW.updated_at = CURRENT_TIMESTAMP;
+        RETURN NEW;
+    END;
+    $$ LANGUAGE plpgsql;""",
+
+    &"""CREATE TRIGGER set_{table.name}_updated_at
+    BEFORE UPDATE ON "{table.name}"
+    FOR EACH ROW
+    EXECUTE FUNCTION {table.name}_updated_at_column();"""
+  ]
+
+
 proc createColumnString*(table:Table, column:Column):string =
   case column.typ:
     # int
@@ -439,3 +456,7 @@ proc createForeignString*(table:Table, column:Column):string =
 
 proc createIndexString*(table:Table, column:Column):string =
   return column.indexColumn(table)
+
+
+proc createUpdatedAtString*(table:Table, column:Column):seq[string] =
+  return column.updatedAtColumn(table)