Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 74b67e1

Browse files
author
Tim Burks
committed
Removed extra log messages, don't return key-value pairs for null values.
1 parent 52100b2 commit 74b67e1

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

‎nu/postgresql.nu‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,50 +33,51 @@
3333
(set row (self dictionaryForTuple:i))
3434
(d setValue:row forKey:(row valueForKey:key))))
3535
d)
36-
36+
3737
(- (id) value is
3838
(if (eq (self tupleCount) 1)
3939
(then (self dictionaryForTuple:0))
4040
(else nil)))
41-
41+
4242
(- (id) dictionaryForTuple:(int)i is
4343
(set d (dict))
4444
((self fieldTypes) eachWithIndex:
4545
(do (ft j)
4646
(set key (ft name))
4747
(set value (self valueOfTuple:i field:j))
48-
(d setObject:value forKey:key)))
48+
(if value
49+
(d setObject:value forKey:key))))
4950
d))
5051

5152
(class PGConnection (ivar-accessors)
52-
53+
5354
;; Perform a query and return the result as an array of dictionaries.
5455
;; Each row of a query result is returned as a dictionary.
5556
(- (id) queryAsArray:(id) query is
5657
(set result (self query:query))
5758
(result array))
58-
59+
5960
(- (id) queryAsArray:(id) query withArguments:(id) args is
6061
(set result (self query:query withArguments:args))
6162
(result array))
62-
63+
6364
;; Perform a query and return the result as a dictionary of dictionaries,
6465
;; with the top-level dictionary keyed by the specified key.
6566
;; Each row of a query result is returned as a dictionary.
6667
(- (id) queryAsDictionary:(id) query withKey:(id) key is
6768
(set result (self query:query))
6869
(result dictionaryWithKey:key))
69-
70+
7071
(- (id) queryAsDictionary:(id) query withArguments:(id) args withKey:(id) key is
7172
(set result (self query:query withArguments:args))
7273
(result dictionaryWithKey:key))
73-
74+
7475
;; Perform a query and return a single result as a dictionary.
7576
;; Returns nil if multiple matches exist.
7677
(- (id) queryAsValue:(id) query is
7778
(set result (self query:query))
7879
(result value))
79-
80+
8081
(- (id) queryAsValue:(id) query withArguments:(id) args is
8182
(set result (self query:query withArguments:args))
8283
(result value)))

‎objc/postgres.m‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ - (id) initWithResult:(PGresult *)r
113113
}
114114
case PGRES_EMPTY_QUERY:
115115
{
116-
NSLog(@"Empty query");
116+
//NSLog(@"Empty query");
117117
break;
118118
}
119119
case PGRES_COPY_OUT:
@@ -293,15 +293,16 @@ - (PGResult *) query:(id)query withArguments:(id) arguments
293293
[queries setObject:queryName forKey:query];
294294
}
295295
else {
296-
NSLog(@"reusing query %@", query);
296+
//NSLog(@"reusing query %@", query);
297297
}
298-
NSLog(@"query name %@", queryName);
298+
//NSLog(@"query name %@", queryName);
299299
PGresult *descriptionResult = PQdescribePrepared(connection, [queryName cStringUsingEncoding:NSUTF8StringEncoding]);
300+
/*
300301
NSLog(@"prepared query expects %d arguments", PQnparams(descriptionResult));
301302
for (int i = 0; i < PQnparams(descriptionResult); i++) {
302303
NSLog(@"param %d type %s", i, nameOfType(PQparamtype(descriptionResult, i)));
303304
}
304-
305+
*/
305306
int paramCount = [arguments count];
306307
char **paramValues = (char **) malloc (paramCount * sizeof(char *));
307308
for (int i = 0; i < paramCount; i++) {

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /