2016-03-25 17:05 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* include/hbclass.ch
! use more restrictive PP rules to avoid possible wrong
interactions with code using 'var' and 'data' identifiers
* force class name to be valid identifier
* commented unused rules
* include/std.ch
! fixed CODEPAGE clause in COPY TO and APPEND FROM commands
+ added VIA and CODEPAGE clauses to JOIN command
* src/rdd/dbcmd.c
* updated comments with some function syntax
This commit is contained in:
@@ -395,7 +395,7 @@
|
||||
#command COPY [TO <(f)>] [FIELDS <fields,...>] ;
|
||||
[FOR <for>] [WHILE <while>] [NEXT <next>] ;
|
||||
[RECORD <rec>] [<rest:REST>] [ALL] ;
|
||||
[DELIMITED [WITH <*delim*>]] [CODEPAGE <cp>] => ;
|
||||
[CODEPAGE <cp>] [DELIMITED [WITH <*delim*>]] => ;
|
||||
__dbDelim( .T., <(f)>, <(delim)>, { <(fields)> }, ;
|
||||
<{for}>, <{while}>, <next>, <rec>, <.rest.>, <cp> )
|
||||
|
||||
@@ -414,7 +414,7 @@
|
||||
#command APPEND [FROM <(f)>] [FIELDS <fields,...>] ;
|
||||
[FOR <for>] [WHILE <while>] [NEXT <next>] ;
|
||||
[RECORD <rec>] [<rest:REST>] [ALL] ;
|
||||
[DELIMITED [WITH <*delim*>]] [CODEPAGE <cp>] => ;
|
||||
[CODEPAGE <cp>] [DELIMITED [WITH <*delim*>]] => ;
|
||||
__dbDelim( .F., <(f)>, <(delim)>, { <(fields)> }, ;
|
||||
<{for}>, <{while}>, <next>, <rec>, <.rest.>, <cp> )
|
||||
|
||||
@@ -450,9 +450,10 @@
|
||||
__dbUpdate( <(alias)>, <{key}>, <.rand.>, ;
|
||||
{|| _FIELD-><f1> := <x1>[, _FIELD-><fN> := <xN>] } )
|
||||
|
||||
#command JOIN [WITH <(alias)>] [TO <f>] [FIELDS <fields,...>] [FOR <for>] => ;
|
||||
#command JOIN [WITH <(alias)>] [TO <f>] [FIELDS <fields,...>] [FOR <for>] ;
|
||||
[VIA <rdd>] [CODEPAGE <cp>] => ;
|
||||
__dbJoin( <(alias)>, <(f)>, { <(fields)> }, ;
|
||||
iif( Empty( #<for> ), {|| .T. }, <{for}> ) )
|
||||
iif( Empty( #<for> ), {|| .T. }, <{for}> ), <rdd>,, <cp> )
|
||||
|
||||
#command COUNT [TO <v>] ;
|
||||
[FOR <for>] [WHILE <while>] [NEXT <next>] ;
|
||||
|
||||
Reference in New Issue
Block a user