Merge pull request #27 from PieterjanMontens/patch_udate_cdate

Customisable created and updated date column names

Author: evoluteur

README.md

@@ -81,7 +81,9 @@ Configuration options are set in the file [config.js](https://github.com/evolute
 | consoleLog    | Log SQL statements to console.|
 | wComments     | Allow for user comments (not implemented yet). |
 | wRating       | Allow for user ratings (not implemented yet). |
-| wTimestamp    | Timestamp columns u_date and c_date w/ date of record creation and last update. |
+| wTimestamp    | Timestamp columns w/ date of record creation and last update. |
+| createdDateColumn | Column containing created date (default `c_date`) |
+| updatedDateColumn | Column containing last update date (default `u_date`) |
 | schemaQueries | Enables endpoints to query for lists of tables and columns in the database schema. |
 | GraphQL       | Set GraphQL = true to unable GraphQL (Work In Progress) |
 

config.js

@@ -27,6 +27,10 @@ module.exports = {
 	wComments: false,
 	wRating: false,
 
+    // - Columns containing created and last updated dates
+    createdDateColumn: 'c_date',
+    updatedDateColumn: 'u_date',
+
 	// - API discovery
 	apiInfo: true,
 

js/graphql-schema.js

@@ -81,8 +81,8 @@ const model2gqlObjectType = m => {
 
     // - "timestamp" columns to track creation and last modification.
     if(config.wTimestamp){
-        fields['c_date'] = gqlField({type: ft.datetime})
-        fields['u_date'] =  gqlField({type: ft.datetime})
+        fields[config.createdDateColumn] = gqlField({type: ft.datetime})
+        fields[config.updatedDateColumn] = gqlField({type: ft.datetime})
     }
     /*
     // - "who-is" columns to track user who created and last modified the record.
@@ -195,4 +195,4 @@ const RootQuery = new GraphQLObjectType({
 
 module.exports = new GraphQLSchema({
    query: RootQuery
-})
+})

js/setup/database.js

@@ -175,7 +175,7 @@ function sqlSchemaWithData(){
         sql += 'CREATE OR REPLACE FUNCTION '+schema+'.u_date() RETURNS trigger\n'+
             '    LANGUAGE plpgsql\n'+
             '    AS $$\n'+
-            '  BEGIN\n    NEW.u_date = now();\n    RETURN NEW;\n  END;\n$$;\n\n';
+            '  BEGIN\n    NEW.'+config.updatedDateColumn+' = now();\n    RETURN NEW;\n  END;\n$$;\n\n';
     }
     for(let mid in models){
         const sqls = sqlModel(mid);
@@ -250,8 +250,8 @@ function sqlModel(mid){
 
     // - "timestamp" columns to track creation and last modification.
     if(config.wTimestamp){
-        fs.push(' c_date timestamp'+noTZ+' DEFAULT timezone(\'utc\'::text, now())');
-        fs.push(' u_date timestamp'+noTZ+' DEFAULT timezone(\'utc\'::text, now())');
+        fs.push(config.createdDateColumn+' timestamp'+noTZ+' DEFAULT timezone(\'utc\'::text, now())');
+        fs.push(config.updatedDateColumn+' timestamp'+noTZ+' DEFAULT timezone(\'utc\'::text, now())');
     }
     // - "who-is" columns to track user who created and last modified the record.
     if(config.wWhoIs){

js/stats.js

@@ -57,13 +57,13 @@ function numbers(req, res) {
         })
         if(config.wTimestamp){
             // - last update
-            sql += ', max(u_date) AS u_date_max' +
+            sql += ', max('+config.updatedDateColumn+') AS u_date_max' +
                 // - number of insert & updates this week
                 ', (SELECT count('+m.pKey+')::integer '+sqlFROM+
-                    ' WHERE u_date > NOW() - interval \'7 days\')'+
+                    ' WHERE '+config.updatedDateColumn+' > NOW() - interval \'7 days\')'+
                     ' AS u_date_week_count' +
                 // - first insert
-                ', min(c_date) AS c_date_min' 
+                ', min('+config.createdDateColumn+') AS c_date_min' 
         }
         if(config.wComments){
             // - number of comments

js/utils/dico.js

@@ -46,12 +46,12 @@ if(config.wTimestamp){
     systemFields.push({
     	// - record creation date
     	type: 'datetime',
-    	column:'c_date',
+    	column: config.createdDateColumn,
     },
     {
     	// - record last update date
     	type: 'datetime',
-    	column:'u_date',
+    	column: config.updatedDateColumn,
     })
 }
 if(config.wWhoIs){