@cyklang/cli 0.7.4 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/Cmd.js +13 -7
- package/build/OpenCommand.d.ts +1 -1
- package/build/OpenCommand.js +11 -5
- package/build/TableCommand.js +12 -3
- package/build/index.js +1 -1
- package/package.json +1 -1
- package/run_test.sh +11 -0
- package/src/Cmd.ts +10 -5
- package/src/OpenCommand.ts +11 -5
- package/src/TableCommand.ts +16 -6
- package/src/index.ts +1 -1
- package/test/db/t10.output +23 -0
- package/test/{t10.xml → db/t10.xml} +44 -22
- package/test/db/t13.output +2 -0
- package/test/{t13.xml → db/t13.xml} +3 -3
- package/test/{t14.output → db/t14.output} +2 -0
- package/test/{t14.xml → db/t14.xml} +2 -2
- package/test/db/t15.output +4 -0
- package/test/{t15.xml → db/t15.xml} +8 -10
- package/test/db/t16.output +16 -0
- package/test/{t16.xml → db/t16.xml} +6 -6
- package/test/{t20.xml → db/t20.xml} +1 -1
- package/test/{t22.xml → db/t22.xml} +7 -7
- package/test/{t23.xml → db/t23.xml} +4 -4
- package/test/t09.output +1 -1
- package/test/t09.xml +1 -1
- package/test/cyklang.xsd +0 -1090
- package/test/t16.output +0 -49
- package/test/t19.xml +0 -234
- /package/test/{t14.xsd → db/t14.xsd} +0 -0
- /package/test/{t20.output → db/t20.output} +0 -0
- /package/test/{t21.output → db/t21.output} +0 -0
- /package/test/{t21.xml → db/t21.xml} +0 -0
- /package/test/{t22.output → db/t22.output} +0 -0
- /package/test/{t23.output → db/t23.output} +0 -0
package/test/t16.output
DELETED
|
@@ -1,49 +0,0 @@
|
|
|
1
|
-
<object name="year">
|
|
2
|
-
<object name="2021">
|
|
3
|
-
<number name="year_num">2021</number>
|
|
4
|
-
<string name="year_begin_date" literal="">2021-01-01</string>
|
|
5
|
-
<string name="year_end_date" literal="">2021-12-31</string>
|
|
6
|
-
</object>
|
|
7
|
-
</object>
|
|
8
|
-
<object name="resultset">
|
|
9
|
-
<object>
|
|
10
|
-
<object name="year">
|
|
11
|
-
<number name="year_num">2021</number>
|
|
12
|
-
<string name="year_begin_date" literal="">2021-01-01</string>
|
|
13
|
-
<string name="year_end_date" literal="">2021-12-31</string>
|
|
14
|
-
</object>
|
|
15
|
-
</object>
|
|
16
|
-
</object>
|
|
17
|
-
<object name="meta">
|
|
18
|
-
<string name="year" literal=""><db.table name="year" id="14">
|
|
19
|
-
<number name="year_num" type="int" primary="">
|
|
20
|
-
</number>
|
|
21
|
-
<string name="year_begin_date" type="date">
|
|
22
|
-
</string>
|
|
23
|
-
<string name="year_end_date" type="date">
|
|
24
|
-
</string>
|
|
25
|
-
</db.table></string>
|
|
26
|
-
<string name="resultset" literal="">year</string>
|
|
27
|
-
</object>
|
|
28
|
-
dbresult.year_begin_date : 2021-01-01
|
|
29
|
-
year_begin_date : 2021-01-01
|
|
30
|
-
year_end_date : 2021-12-31
|
|
31
|
-
year_begin : 2021-01-01 09:00:00 GMT+0400
|
|
32
|
-
year_end : 2021-12-31 09:00:00 GMT+0400
|
|
33
|
-
year_end greater than year_begin
|
|
34
|
-
OK Février
|
|
35
|
-
test IF before
|
|
36
|
-
monthlabel Mars
|
|
37
|
-
test IF after
|
|
38
|
-
month 1 Janvier 2021 2021-01-01 -> 2021-01-31
|
|
39
|
-
month 2 Février 2021 2021-02-01 -> 2021-02-28
|
|
40
|
-
month 3 Mars 2021 2021-03-01 -> 2021-03-31
|
|
41
|
-
month 4 Avril 2021 2021-04-01 -> 2021-04-30
|
|
42
|
-
month 5 Mai 2021 2021-05-01 -> 2021-05-31
|
|
43
|
-
month 6 Juin 2021 2021-06-01 -> 2021-06-30
|
|
44
|
-
month 7 Juillet 2021 2021-07-01 -> 2021-07-31
|
|
45
|
-
month 8 Août 2021 2021-08-01 -> 2021-08-31
|
|
46
|
-
month 9 Septembre 2021 2021-09-01 -> 2021-09-30
|
|
47
|
-
month 10 Octobre 2021 2021-10-01 -> 2021-10-31
|
|
48
|
-
month 11 Novembre 2021 2021-11-01 -> 2021-11-30
|
|
49
|
-
month 12 Décembre 2021 2021-12-01 -> 2021-12-31
|
package/test/t19.xml
DELETED
|
@@ -1,234 +0,0 @@
|
|
|
1
|
-
<?xml-model href="cyklang.xsd" ?>
|
|
2
|
-
<module>
|
|
3
|
-
<!--
|
|
4
|
-
function build_entries
|
|
5
|
-
-->
|
|
6
|
-
|
|
7
|
-
<function name="build_entries" returns="result: object">
|
|
8
|
-
<object name="param"/>
|
|
9
|
-
<object name="model_entries"/>
|
|
10
|
-
<block>
|
|
11
|
-
<set name="result"></set>
|
|
12
|
-
<call object="model_entries" method="foreach">
|
|
13
|
-
<function>
|
|
14
|
-
<object name="model_entry"/>
|
|
15
|
-
<block>
|
|
16
|
-
<object name="entry">newDBRow("entry")</object>
|
|
17
|
-
<set name="entry.entry_ord">model_entry.ent_ord</set>
|
|
18
|
-
<set name="entry.entry_acct">eval(model_entry.ent_acct)</set>
|
|
19
|
-
<set name="entry.entry_aux">eval(model_entry.ent_aux)</set>
|
|
20
|
-
<set name="entry.entry_debit">eval(model_entry.ent_debit)</set>
|
|
21
|
-
<set name="entry.entry_credit">eval(model_entry.ent_credit)</set>
|
|
22
|
-
<call object="result" method="push">
|
|
23
|
-
<object>entry</object>
|
|
24
|
-
</call>
|
|
25
|
-
</block>
|
|
26
|
-
</function>
|
|
27
|
-
</call>
|
|
28
|
-
</block>
|
|
29
|
-
</function>
|
|
30
|
-
|
|
31
|
-
<!--
|
|
32
|
-
function update_document_entries
|
|
33
|
-
-->
|
|
34
|
-
|
|
35
|
-
<function name="update_document_entries">
|
|
36
|
-
<number name="doc_id"/>
|
|
37
|
-
<block>
|
|
38
|
-
|
|
39
|
-
<object name="result_document"/>
|
|
40
|
-
<!-- <db.execute select_from_table="document" result="result_document">
|
|
41
|
-
<string name="where">"doc_id="+doc_id</string>
|
|
42
|
-
</db.execute> -->
|
|
43
|
-
|
|
44
|
-
<db.select table="document" result="result_document">
|
|
45
|
-
<string name="where">"doc_id="+doc_id</string>
|
|
46
|
-
</db.select>
|
|
47
|
-
|
|
48
|
-
<if>
|
|
49
|
-
<condition>result_document.document.length() == 0</condition>
|
|
50
|
-
<then>
|
|
51
|
-
<print>"doc_id "+doc_id+" not found"</print>
|
|
52
|
-
<break/>
|
|
53
|
-
</then>
|
|
54
|
-
<condition>result_document.document.at(0).doc_model == undefined</condition>
|
|
55
|
-
<then>
|
|
56
|
-
<print>"doc_id "+doc_id+" doc_model is null"</print>
|
|
57
|
-
<break/>
|
|
58
|
-
</then>
|
|
59
|
-
</if>
|
|
60
|
-
|
|
61
|
-
<object name="document">result_document.document.at(0)</object>
|
|
62
|
-
|
|
63
|
-
<object name="result_model"/>
|
|
64
|
-
|
|
65
|
-
<db.select table="model" result="result_model">
|
|
66
|
-
<string name="where">"model_id="+document.doc_model</string>
|
|
67
|
-
</db.select>
|
|
68
|
-
|
|
69
|
-
<!-- <db.execute select_from_table="model" result="result_model">
|
|
70
|
-
<string name="where">"model_id="+document.doc_model</string>
|
|
71
|
-
</db.execute> -->
|
|
72
|
-
|
|
73
|
-
<if>
|
|
74
|
-
<condition>result_model.model.length() == 0</condition>
|
|
75
|
-
<then>
|
|
76
|
-
<print>"doc_id "+doc_id+", doc_model "+document.doc_model +" not found"</print>
|
|
77
|
-
<break/>
|
|
78
|
-
</then>
|
|
79
|
-
</if>
|
|
80
|
-
|
|
81
|
-
<object name="model">result_model.model.at(0)</object>
|
|
82
|
-
|
|
83
|
-
<object name="new_entries"/>
|
|
84
|
-
<call function="build_entries" returns="new_entries">
|
|
85
|
-
<object name="param">object(document.doc_params)</object>
|
|
86
|
-
<object name="model_entries">object(model.model_entries)</object>
|
|
87
|
-
</call>
|
|
88
|
-
|
|
89
|
-
<call object="new_entries" method="foreach">
|
|
90
|
-
<function>
|
|
91
|
-
<object name="entry"/>
|
|
92
|
-
<block>
|
|
93
|
-
<set name="entry.entry_year">document.doc_year</set>
|
|
94
|
-
<set name="entry.entry_date">document.doc_date</set>
|
|
95
|
-
<set name="entry.entry_jnl">document.doc_jnl</set>
|
|
96
|
-
<set name="entry.entry_doc">document.doc_id</set>
|
|
97
|
-
</block>
|
|
98
|
-
</function>
|
|
99
|
-
</call>
|
|
100
|
-
<print>"***** NEW ENTRIES ******"</print>
|
|
101
|
-
<print>string(new_entries)</print>
|
|
102
|
-
|
|
103
|
-
<object name="result_old_entries"/>
|
|
104
|
-
|
|
105
|
-
<db.select table="entry" result="result_old_entries">
|
|
106
|
-
<string name="where">"entry_doc="+doc_id</string>
|
|
107
|
-
<string name="order_by">"entry_ord,entry_id"</string>
|
|
108
|
-
</db.select>
|
|
109
|
-
|
|
110
|
-
<!-- <db.execute select_from_table="entry" result="result_old_entries">
|
|
111
|
-
<string name="where">"entry_doc="+doc_id</string>
|
|
112
|
-
<string name="order_by">"entry_ord,entry_id"</string>
|
|
113
|
-
</db.execute> -->
|
|
114
|
-
<object name="old_entries">result_old_entries.entry</object>
|
|
115
|
-
<print>"***** OLD ENTRIES ******"</print>
|
|
116
|
-
<print>string(old_entries)</print>
|
|
117
|
-
|
|
118
|
-
<!-- synchronize between old_entries and new_entries -->
|
|
119
|
-
|
|
120
|
-
<number name="i_old">0</number>
|
|
121
|
-
<number name="i_new">0</number>
|
|
122
|
-
|
|
123
|
-
<object name="old_entry"/>
|
|
124
|
-
<object name="new_entry"/>
|
|
125
|
-
|
|
126
|
-
<function name="next_old">
|
|
127
|
-
<block>
|
|
128
|
-
<if>
|
|
129
|
-
<condition><![CDATA[ i_old < old_entries.length() ]]></condition>
|
|
130
|
-
<then>
|
|
131
|
-
<set name="old_entry">old_entries.at(i_old)</set>
|
|
132
|
-
<set name="i_old">i_old + 1</set>
|
|
133
|
-
</then>
|
|
134
|
-
<else>
|
|
135
|
-
<set name="old_entry">undefined</set>
|
|
136
|
-
</else>
|
|
137
|
-
</if>
|
|
138
|
-
</block>
|
|
139
|
-
</function>
|
|
140
|
-
|
|
141
|
-
<function name="next_new">
|
|
142
|
-
<block>
|
|
143
|
-
<if>
|
|
144
|
-
<condition><![CDATA[ i_new < new_entries.length() ]]></condition>
|
|
145
|
-
<then>
|
|
146
|
-
<set name="new_entry">new_entries.at(i_new)</set>
|
|
147
|
-
<set name="i_new">i_new + 1</set>
|
|
148
|
-
</then>
|
|
149
|
-
<else>
|
|
150
|
-
<set name="new_entry">undefined</set>
|
|
151
|
-
</else>
|
|
152
|
-
</if>
|
|
153
|
-
</block>
|
|
154
|
-
</function>
|
|
155
|
-
|
|
156
|
-
<call function="next_old"/>
|
|
157
|
-
<call function="next_new"/>
|
|
158
|
-
|
|
159
|
-
<loop>
|
|
160
|
-
<break>old_entry == undefined</break>
|
|
161
|
-
<loop>
|
|
162
|
-
<break>new_entry == undefined</break>
|
|
163
|
-
<break> <![CDATA[ new_entry.entry_ord >= old_entry.entry_ord ]]> </break>
|
|
164
|
-
|
|
165
|
-
<db.insert table="entry">
|
|
166
|
-
<object>new_entry</object>
|
|
167
|
-
</db.insert>
|
|
168
|
-
|
|
169
|
-
<!-- <db.execute insert_into_table="entry">
|
|
170
|
-
<object>new_entry</object>
|
|
171
|
-
</db.execute> -->
|
|
172
|
-
<print>"old_entry : "+old_entry.entry_ord+", insert new_entry : "+new_entry.entry_ord</print>
|
|
173
|
-
<call function="next_new"/>
|
|
174
|
-
</loop>
|
|
175
|
-
|
|
176
|
-
<if>
|
|
177
|
-
<condition>new_entry == undefined</condition>
|
|
178
|
-
<then>
|
|
179
|
-
<db.delete table="entry">
|
|
180
|
-
<object>old_entry</object>
|
|
181
|
-
</db.delete>
|
|
182
|
-
<!-- <db.execute delete_from_table="entry">
|
|
183
|
-
<object>old_entry</object>
|
|
184
|
-
</db.execute> -->
|
|
185
|
-
<print>"delete old_entry : "+old_entry.entry_ord +", new_entry undefined"</print>
|
|
186
|
-
</then>
|
|
187
|
-
<condition><![CDATA[ old_entry.entry_ord < new_entry.entry_ord ]]> </condition>
|
|
188
|
-
<then>
|
|
189
|
-
<db.delete table="entry">
|
|
190
|
-
<object>old_entry</object>
|
|
191
|
-
</db.delete>
|
|
192
|
-
<!-- <db.execute delete_from_table="entry">
|
|
193
|
-
<object>old_entry</object>
|
|
194
|
-
</db.execute> -->
|
|
195
|
-
<print>"delete old_entry : "+old_entry.entry_ord+", new_entry = "+new_entry.entry_ord</print>
|
|
196
|
-
</then>
|
|
197
|
-
<condition>old_entry.entry_ord == new_entry.entry_ord</condition>
|
|
198
|
-
<then>
|
|
199
|
-
<set name="new_entry.entry_id">old_entry.entry_id</set>
|
|
200
|
-
<db.update table="entry">
|
|
201
|
-
<object>new_entry</object>
|
|
202
|
-
</db.update>
|
|
203
|
-
<!-- <db.execute update_table="entry">
|
|
204
|
-
<object>new_entry</object>
|
|
205
|
-
</db.execute> -->
|
|
206
|
-
<print>"update new_entry id="+new_entry.entry_id+", ord="+new_entry.entry_ord</print>
|
|
207
|
-
<call function="next_new"/>
|
|
208
|
-
</then>
|
|
209
|
-
</if>
|
|
210
|
-
|
|
211
|
-
<call function="next_old"/>
|
|
212
|
-
</loop>
|
|
213
|
-
|
|
214
|
-
<loop>
|
|
215
|
-
<break>new_entry == undefined</break>
|
|
216
|
-
<db.insert table="entry">
|
|
217
|
-
<object>new_entry</object>
|
|
218
|
-
</db.insert>
|
|
219
|
-
<!-- <db.execute insert_into_table="entry">
|
|
220
|
-
<object>new_entry</object>
|
|
221
|
-
</db.execute> -->
|
|
222
|
-
|
|
223
|
-
<print>"after old_entries, insert new_entry : "+new_entry.entry_ord</print>
|
|
224
|
-
<call function="next_new"/>
|
|
225
|
-
</loop>
|
|
226
|
-
|
|
227
|
-
</block>
|
|
228
|
-
</function>
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
<call function="update_document_entries">
|
|
232
|
-
<number name="doc_id">4</number>
|
|
233
|
-
</call>
|
|
234
|
-
</module>
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|