rdo-postgres 0.0.10 → 0.0.11

data/README.md

@@ -5,11 +5,14 @@ This is the PostgreSQL driver for [RDO—Ruby Data Objects]
 
 [![Build Status](https://secure.travis-ci.org/d11wtq/rdo-postgres.png?branch=master)](http://travis-ci.org/d11wtq/rdo-postgres)
 
-Refer to the RDO project [README](https://github.com/d11wtq/rdo) for usage
-information.
+Refer to the [RDO project README](https://github.com/d11wtq/rdo) for full
+usage information.
 
-This driver cannot be used with PostgreSQL versions older than 7.4. Those
-versions are no longer supported by PostgreSQL in any case.
+## Supported PostgreSQL version
+
+This driver supports PostgreSQL versions >= 7.4.
+
+Older versions are no longer supported by PostgreSQL in any case.
 
 ## Installation
 
@@ -27,56 +30,87 @@ And install with Bundler:
 
 ## Usage
 
-The registered URI schemes are postgres:// and postgresql://
+The registered URI schemes are postgres://, postgresql:// and psql://.
 
 ``` ruby
-require "rdo"
 require "rdo-postgres"
 
 conn = RDO.connect("postgres://user:pass@localhost/dbname?encoding=utf-8")
 ```
 
-Alternatively, give the driver name as "postgres" or "postgresql" in an
-options Hash.
-
-``` ruby
-conn = RDO.connect(
-  driver:    "postgresql",
-  host:      "localhost",
-  user:      "user",
-  passsword: "pass",
-  database:  "dbname",
-  encoding:  "utf-8"
-)
-```
-
 ### Type Support
 
 If not listed below, the String form of the value will be returned. The
-currently mapped types are:
-
-  - NULL -> nil
-  - BOOLEAN -> TrueClass/FalseClass
-  - TEXT -> String
-  - VARCHAR -> String
-  - CHAR -> String
-  - BYTEA -> String
-  - INTEGER -> Fixnum
-  - INT2 -> Fixnum
-  - INT4 -> Fixnum
-  - INT8 -> Fixnum
-  - FLOAT/REAL -> Float
-  - FLOAT4 -> Float
-  - FLOAT8 -> Float
-  - NUMERIC/DECIMAL -> BigDecimal
-  - DATE -> Date
-  - TIMESTAMP -> DateTime (in the system time zone)
-  - TIMESTAMPTZ -> DateTime (in the specified time zone)
-
-All **n-dimensional Arrays** of the above listed **are supported**. Support
-for custom-typed Arrays is coming.
-
-### Bind parameters support
+currently mapped types are tabled below:
+
+<table>
+  <thead>
+    <tr>
+      <th>PostgreSQL Type</th>
+      <th>Ruby Type</th>
+      <th>Notes</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <th>null</th>
+      <td>NilClass</td>
+      <td></td>
+    </tr>
+    <tr>
+      <th>boolean</th>
+      <td>TrueClass, FalseClass</td>
+      <td>The strings 't' and 'f' will work as inputs too</td>
+    </tr>
+    <tr>
+      <th>text, char, varchar</th>
+      <td>String</td>
+      <td>The encoding specified on the connection is used</td>
+    </tr>
+    <tr>
+      <th>bytea</th>
+      <td>String</td>
+      <td>The output encoding is set to ASCII-8BIT/BINARY</td>
+    </tr>
+    <tr>
+      <th>integer, int4, int2, int8</th>
+      <td>Fixnum</td>
+      <td>Ruby may use a Bignum, if needed</td>
+    </tr>
+    <tr>
+      <th>float, real, float4, float8</th>
+      <td>Float</td>
+      <td>NaN, Infinity and -Infinity are supported</td>
+    </tr>
+    <tr>
+      <th>numeric, decimal</th>
+      <td>BigDecimal</td>
+      <td>NaN is supported</td>
+    </tr>
+    <tr>
+      <th>date</th>
+      <td>Date</td>
+      <td></td>
+    </tr>
+    <tr>
+      <th>timestamp</th>
+      <td>DateTime</td>
+      <td>Input may also be a Time; output times are in the system time zone</td>
+    </tr>
+    <tr>
+      <th>timestamp with time zone</th>
+      <td>DateTime</td>
+      <td>Input may also be a Time</td>
+    </tr>
+    <tr>
+      <th>array</th>
+      <td>Array</td>
+      <td>n-dimensional arrays of the types listed above are supported</td>
+    </tr>
+  </tbody>
+</table>
+
+### PostgreSQL style bind parameters
 
 PostgreSQL uses $1, $2 etc for bind parameters. RDO uses '?'. You can use
 either, but you **cannot** mix both styles in the same query, or you will
@@ -95,6 +129,16 @@ This is **not ok**:
 conn.execute("SELECT * FROM users WHERE banned = $1 AND created_at > ?", true, 1.week.ago)
 ```
 
+### HStore Operators
+
+Some of the hstore operators in PostgreSQL use the '?' character. If you need
+to use them, for now, you need to escape the '?' so RDO doesn't confuse them
+for bind markers. I'd like to remove this restriction.
+
+``` ruby
+conn.execute(%q{SELECT 'foo=>42,bar=>101'::hstore \? ?}, "foo")
+```
+
 ## Contributing
 
 If you find any bugs, please send a pull request if you think you can
@@ -105,8 +149,7 @@ custom types, such as ENUMs (this is done by reading from pg_type, in an
 efficient manner).
 
 When sending pull requests, please use topic branches—don't send a pull
-request from the master branch of your fork, as that may change
-unintentionally.
+request from the master branch of your fork.
 
 Contributors will be credited in this README.
 

data/ext/rdo_postgres/params.c

@@ -11,7 +11,7 @@
 #include <math.h>
 
 /** Get the strlen of the marker (e.g. $2) based on its index */
-#define RDO_PG_MARKER_LEN(n) (n >= 100 ? 4 : (n >= 10 ? 3 : 2))
+#define RDO_PG_MARKER_LEN(n) (n > 0 ? (int) floor(log10(n)) + 2 : 2)
 
 /**
  * Replace e.g. "SELECT ? WHERE ?" with "SELECT $1 WHERE $2".
@@ -22,7 +22,7 @@
  */
 char * rdo_postgres_params_inject_markers(char * stmt) {
   int    len     = strlen(stmt);
-  char * buf     = malloc(sizeof(char) * len ? (len * (floor(log(len)) + 2)) : 0);
+  char * buf     = malloc(sizeof(char) * len ? (len * (floor(log10(len)) + 2)) : 0);
   char * s       = stmt;
   char * b       = buf;
   int    n       = 0;
@@ -78,6 +78,13 @@ char * rdo_postgres_params_inject_markers(char * stmt) {
         }
         break;
 
+      case '\\':
+        if (!instr && !inident && !inmlcmt && !inslcmt && *(s + 1) == '?')
+          ++s;
+
+        *b = *s;
+        break;
+
       case '"':
         if (!instr && !inmlcmt && !inslcmt) {
           inident = !inident;
@@ -90,9 +97,9 @@ char * rdo_postgres_params_inject_markers(char * stmt) {
       case '?':
         if (!instr && !inident && !inmlcmt && !inslcmt) {
           sprintf(b, "$%i", ++n);
-          b += RDO_PG_MARKER_LEN(n -1) - 1;
+          b += RDO_PG_MARKER_LEN(n) - 1;
         } else {
-          *b= *s;
+          *b = *s;
         }
         break;
 

data/lib/rdo/postgres/version.rb

@@ -7,6 +7,6 @@
 
 module RDO
   module Postgres
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdo-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdo
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: PostgreSQL Driver for RDO