| | @@ -23,11 +23,11 @@ |
| 23 | 23 | } |
| 24 | 24 | set a [xyz] |
| 25 | 25 | puts "a=${a}" ! \n |
| 26 | 26 | |
| 27 | 27 | set stmt [query prepare {SELECT login, cap FROM user}] |
| 28 | | -set colCount [query col_count $stmt] |
| 28 | +set colCount [query col count $stmt] |
| 29 | 29 | puts "query column count: ${colCount}\n" |
| 30 | 30 | puts "stmt id=${stmt}\n" |
| 31 | 31 | |
| 32 | 32 | proc noop {} {} |
| 33 | 33 | proc incr {name {step 1}} { |
| | @@ -38,11 +38,11 @@ |
| 38 | 38 | |
| 39 | 39 | set sep " " |
| 40 | 40 | set i 0 |
| 41 | 41 | set colNames(0) 0 |
| 42 | 42 | for {set i 0} {$i < $colCount} {incr i} { |
| 43 | | - set colNames($i) [query col_name $stmt $i] |
| 43 | + set colNames($i) [query col name $stmt $i] |
| 44 | 44 | puts "colNames($i)=" $colNames($i) "\n" |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | for {set row 0} {0 < [query step $stmt]} {incr row} { |
| 48 | 48 | for {set i 0} {$i < $colCount} {incr i} { |
| | @@ -49,11 +49,11 @@ |
| 49 | 49 | if {$i > 0} { |
| 50 | 50 | puts $sep |
| 51 | 51 | } else { |
| 52 | 52 | puts "#$row: $sep" |
| 53 | 53 | } |
| 54 | | - puts $colNames($i) = [query col_string $stmt $i] |
| 54 | + puts $colNames($i) = [query col string $stmt $i] |
| 55 | 55 | } |
| 56 | 56 | puts "\n" |
| 57 | 57 | } |
| 58 | 58 | unset row |
| 59 | 59 | |
| | @@ -60,13 +60,13 @@ |
| 60 | 60 | query finalize $stmt |
| 61 | 61 | |
| 62 | 62 | |
| 63 | 63 | proc query_step_each {{stmt} {callback}} { |
| 64 | 64 | set colNames(0) 0 |
| 65 | | - set colCount [query col_count $stmt] |
| 65 | + set colCount [query col count $stmt] |
| 66 | 66 | for {set i 0} {$i < $colCount} {incr i} { |
| 67 | | - set colNames($i) [query col_name $stmt $i] |
| 67 | + set colNames($i) [query col name $stmt $i] |
| 68 | 68 | } |
| 69 | 69 | upvar cb $callback |
| 70 | 70 | for {set row 0} {0 < [query step $stmt]} {incr row} { |
| 71 | 71 | #puts "Calling callback: $stmt $colCount colNames\n" |
| 72 | 72 | $callback $stmt $colCount |
| | @@ -76,25 +76,25 @@ |
| 76 | 76 | set sql {SELECT uid, login FROM user WHERE uid!=?} |
| 77 | 77 | #set sql {SELECT uid, login FROM user WHERE login=?} |
| 78 | 78 | #set sql {SELECT tagid, value, null FROM tagxref WHERE value IS ? LIMIT 3} |
| 79 | 79 | set stmt [query prepare $sql] |
| 80 | 80 | puts "stmt ID=" $stmt "\n" |
| 81 | | -query bind_int $stmt 1 3 |
| 81 | +query bind int $stmt 1 3 |
| 82 | 82 | #set stmt [query prepare $sql] |
| 83 | | -#query bind_string $stmt 1 stephan |
| 83 | +#query bind string $stmt 1 stephan |
| 84 | 84 | #set stmt [query prepare $sql] |
| 85 | | -#query bind_null $stmt 1 |
| 85 | +#query bind null $stmt 1 |
| 86 | 86 | set rc 0 |
| 87 | 87 | puts "USER LIST:\n" |
| 88 | 88 | catch { |
| 89 | 89 | proc my_each {stmt colCount} { |
| 90 | 90 | upvar 2 sep sep |
| 91 | | - puts [query col_int $stmt 0] " (type=" [query col_type $stmt 0] ")" $sep |
| 92 | | - puts [query col_double $stmt 0] $sep |
| 93 | | - puts [query col_string $stmt 1] " (type=" [query col_type $stmt 1] ")" $sep |
| 94 | | - puts "isnull 0 ?= " [query col_is_null $stmt 0] $sep |
| 95 | | - puts "isnull 2 ?= " [query col_is_null $stmt 2] |
| 91 | + puts [query col int $stmt 0] " (type=" [query col type $stmt 0] ")" $sep |
| 92 | + puts [query col double $stmt 0] $sep |
| 93 | + puts [query col string $stmt 1] " (type=" [query col type $stmt 1] ")" $sep |
| 94 | + puts "isnull 0 ?= " [query col is_null $stmt 0] $sep |
| 95 | + puts "isnull 2 ?= " [query col is_null $stmt 2] |
| 96 | 96 | # for {set i 0} {$i < $colCount} {incr i} { |
| 97 | 97 | # if {$i > 0} { puts $sep } |
| 98 | 98 | # } |
| 99 | 99 | puts "\n" |
| 100 | 100 | # error "hi!" |
| 101 | 101 | |