From 625ada53f25eab888960450026d2a974f456bd7a Mon Sep 17 00:00:00 2001
From: totoro <david.rene@calexium.com>
Date: Sat, 29 Apr 2017 09:07:07 +0900
Subject: [PATCH] add "+" concatenation for String + DB_time, DB_time + String, DB_datetime + String, String + DB_datetime ,

---
 database/db_types.anubis       | 32 +++++++++++++++++++++++++++++++-
 database/model/db_model.anubis |  8 +++-----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/database/db_types.anubis b/database/db_types.anubis
index b2ed5a6..b1874b4 100644
--- a/database/db_types.anubis
+++ b/database/db_types.anubis
@@ -98,6 +98,16 @@ public define String
   date(d).
 
 public define String
+  String s + DB_date d =
+  s + to_String(d)
+.
+
+public define String
+  DB_date d + String s =
+  to_String(d) + s
+.
+
+public define String
   to_String
   (
     DB_datetime dt
@@ -105,12 +115,32 @@ public define String
   datetime(dt).
 
 public define String
+  String s + DB_datetime dt =
+  s + to_String(dt)
+.
+
+public define String
+  DB_datetime dt + String s =
+  to_String(dt) + s
+.
+
+public define String
   to_String
   (
     DB_time t
   )=
   time(t).
-  
+
+public define String
+  String s + DB_time t =
+  s + to_String(t)
+.
+
+public define String
+  DB_time t + String s =
+  to_String(t) + s
+.
+
 public define String
   to_DBString
   (
diff --git a/database/model/db_model.anubis b/database/model/db_model.anubis
index 02f3064..d104cf8 100644
--- a/database/model/db_model.anubis
+++ b/database/model/db_model.anubis
@@ -200,17 +200,15 @@ define macro Maybe(String)
    mapor((HK_Model_Column cs) |-> 
             if cs is col(name,_,_) then is_forbidden_column_name(name),
          cols).
-   
+
  define Bool
    has_forbidden_column_names
    (
      DB_Model_DB   db
    ) =
-   if db is database(_,tables) then 
-   mapor(has_forbidden_column_names,tables). 
-         
+   if db is database(_,tables) then
+   mapor(has_forbidden_column_names,tables).
 
-   
    *** [3] Generating the target file. 
    
       *** [3.1] Converting a database type into the corresponding Anubis type: 
--
libgit2 0.21.4