steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove >r r>

db4
Doug Coleman 2008-11-29 12:18:09 -06:00
parent 1ba6eee2c0
commit 9d5732671d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/db/db.factor
View File

@ -48,7 +48,7 @@ GENERIC: more-rows? ( result-set -- ? )
: new-result-set ( query handle class -- result-set ) : new-result-set ( query handle class -- result-set )
new new
swap >>handle swap >>handle
>r [ sql>> ] [ in-params>> ] [ out-params>> ] tri r> [ [ sql>> ] [ in-params>> ] [ out-params>> ] tri ] dip
swap >>out-params swap >>out-params
swap >>in-params swap >>in-params
swap >>sql ; swap >>sql ;

6
basis/db/postgresql/lib/lib.factor
View File

@ -75,7 +75,7 @@ M: postgresql-result-null summary ( obj -- str )
: param-values ( statement -- seq seq2 ) : param-values ( statement -- seq seq2 )
[ bind-params>> ] [ in-params>> ] bi [ bind-params>> ] [ in-params>> ] bi
[ [
>r value>> r> type>> { [ value>> ] [ type>> ] bi* {
{ FACTOR-BLOB [ { FACTOR-BLOB [
dup [ object>bytes malloc-byte-array/length ] [ 0 ] if dup [ object>bytes malloc-byte-array/length ] [ 0 ] if
] } ] }
@ -98,7 +98,7 @@ M: postgresql-result-null summary ( obj -- str )
: do-postgresql-bound-statement ( statement -- res ) : do-postgresql-bound-statement ( statement -- res )
[ [
>r db get handle>> r> [ db get handle>> ] dip
{ {
[ sql>> ] [ sql>> ]
[ bind-params>> length ] [ bind-params>> length ]
@ -116,7 +116,7 @@ M: postgresql-result-null summary ( obj -- str )
: pq-get-string ( handle row column -- obj ) : pq-get-string ( handle row column -- obj )
3dup PQgetvalue utf8 alien>string 3dup PQgetvalue utf8 alien>string
dup empty? [ >r pq-get-is-null f r> ? ] [ 3nip ] if ; dup empty? [ [ pq-get-is-null f ] dip ? ] [ 3nip ] if ;
: pq-get-number ( handle row column -- obj ) : pq-get-number ( handle row column -- obj )
pq-get-string dup [ string>number ] when ; pq-get-string dup [ string>number ] when ;

4
basis/db/queries/queries.factor
View File

@ -95,7 +95,7 @@ M: random-id-generator eval-generator ( singleton -- obj )
3drop 3drop
] [ ] [
pick column-name>> 0% pick column-name>> 0%
>r first2 r> interval-comparison 0% [ first2 ] dip interval-comparison 0%
bind# bind#
] if ; ] if ;
@ -201,7 +201,7 @@ M: db <count-statement> ( query -- statement )
: create-index ( index-name table-name columns -- ) : create-index ( index-name table-name columns -- )
[ [
>r >r "create index " % % r> " on " % % r> "(" % [ [ "create index " % % ] dip " on " % % ] 2dip "(" %
"," join % ")" % "," join % ")" %
] "" make sql-command ; ] "" make sql-command ;