Anubis / Xlib

Commit 625ada53f25eab888960450026d2a974f456bd7a

Authored by totoro
1 parent 84a944c7

add "+" concatenation for 

String + DB_time,
DB_time + String,
DB_datetime + String,
String + DB_datetime
,
Showing 2 changed files with 34 additions and 6 deletions   Show diff stats
Inline Side-by-side
database/db_types.anubis
  Show/Hide comments   View file @625ada5
@@ -98,6 +98,16 @@ public define String @@ -98,6 +98,16 @@ public define String
98 date(d). 98 date(d).
99 99
100 public define String 100 public define String
  101 + String s + DB_date d =
  102 + s + to_String(d)
  103 +.
  104 +
  105 +public define String
  106 + DB_date d + String s =
  107 + to_String(d) + s
  108 +.
  109 +
  110 +public define String
101 to_String 111 to_String
102 ( 112 (
103 DB_datetime dt 113 DB_datetime dt
@@ -105,12 +115,32 @@ public define String @@ -105,12 +115,32 @@ public define String
105 datetime(dt). 115 datetime(dt).
106 116
107 public define String 117 public define String
  118 + String s + DB_datetime dt =
  119 + s + to_String(dt)
  120 +.
  121 +
  122 +public define String
  123 + DB_datetime dt + String s =
  124 + to_String(dt) + s
  125 +.
  126 +
  127 +public define String
108 to_String 128 to_String
109 ( 129 (
110 DB_time t 130 DB_time t
111 )= 131 )=
112 time(t). 132 time(t).
113 - 133 +
  134 +public define String
  135 + String s + DB_time t =
  136 + s + to_String(t)
  137 +.
  138 +
  139 +public define String
  140 + DB_time t + String s =
  141 + to_String(t) + s
  142 +.
  143 +
114 public define String 144 public define String
115 to_DBString 145 to_DBString
116 ( 146 (
database/model/db_model.anubis
  Show/Hide comments   View file @625ada5
@@ -200,17 +200,15 @@ define macro Maybe(String) @@ -200,17 +200,15 @@ define macro Maybe(String)
200 mapor((HK_Model_Column cs) |-> 200 mapor((HK_Model_Column cs) |->
201 if cs is col(name,_,_) then is_forbidden_column_name(name), 201 if cs is col(name,_,_) then is_forbidden_column_name(name),
202 cols). 202 cols).
203 - 203 +
204 define Bool 204 define Bool
205 has_forbidden_column_names 205 has_forbidden_column_names
206 ( 206 (
207 DB_Model_DB db 207 DB_Model_DB db
208 ) = 208 ) =
209 - if db is database(_,tables) then  
210 - mapor(has_forbidden_column_names,tables).  
211 - 209 + if db is database(_,tables) then
  210 + mapor(has_forbidden_column_names,tables).
212 211
213 -  
214 *** [3] Generating the target file. 212 *** [3] Generating the target file.
215 213
216 *** [3.1] Converting a database type into the corresponding Anubis type: 214 *** [3.1] Converting a database type into the corresponding Anubis type: