rdbi-driver-postgresql 0.9.1 → 0.9.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c6929b7b46d9fa0ff8b4e34555728cd5395160d6
+  data.tar.gz: 6cfe5835b695e61bace5272dc48eea1faab306a2
+SHA512:
+  metadata.gz: fa2836418a5713bc58e644a7ebd932102bebc0af42a7b400041ca9e35e9b990d617af222b72e897b1160f76bf9e3a8aa544021070e8176d9386e4eb8782ffce1
+  data.tar.gz: 87485476570b677feed8b38440d593b9d599f2c8ecb06dc177f203b04bb488fcd77bc819a30a9f316750a37d0a901961dd89d9e91976c672926f5e547c2a53da

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT Licence
 
-Copyright (c) 2010 Pistos
+Copyright (c) 2010 Pistos, Erik Hollensbe
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Manifest.txt

@@ -0,0 +1,9 @@
+LICENSE
+Manifest.txt
+README.txt
+Rakefile
+lib/rdbi-driver-postgresql.rb
+lib/rdbi/driver/postgresql.rb
+rdbi-driver-postgresql.gemspec
+test/helper.rb
+test/test_database.rb

data/{README.rdoc → README.txt}

@@ -10,7 +10,7 @@ The PostgreSQL database driver for RDBI.
 
 == Copyright
 
-Copyright (c) 2010 Pistos. See LICENCE for details.
+Copyright (c) 2010-2011 Pistos. See LICENCE for details.
 
 == Acknowledgements
 

data/Rakefile

@@ -1,62 +1,46 @@
+# -*- ruby -*-
+
 require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rdbi-driver-postgresql"
-    gem.summary = %Q{PostgreSQL driver for RDBI}
-    gem.description = %Q{PostgreSQL driver for RDBI}
-    gem.email = "rdbi@pistos.oib.com"
-    gem.homepage = "http://github.com/Pistos/rdbi-dbd-postgresql"
-    gem.authors = [ "Pistos", "Erik Hollensbe" ]
-
-    gem.add_development_dependency 'test-unit'
-    gem.add_development_dependency 'rdoc'
-    gem.add_development_dependency 'rdbi-dbrc'
-
-    gem.add_dependency 'rdbi'
-    gem.add_dependency 'pg', '= 0.9.0'
-    gem.add_dependency 'methlab'
-    gem.add_dependency 'epoxy', '>= 0.3.1'
-
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'hoe'
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+Hoe.plugins.delete :rubyforge
+Hoe.plugin :git
+Hoe.plugin :rcov
+Hoe.plugin :roodi
+Hoe.plugin :reek
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
+spec = Hoe.spec 'rdbi-driver-postgresql' do
+  developer 'Pistos', 'pistos@purepistos.net'
+  developer 'Erik Hollensbe', 'erik@hollensbe.org'
+
+  self.rubyforge_name = nil
 
-task :test => :check_dependencies
+  self.description = <<-EOF
+  This is the PostgreSQL driver for RDBI.
 
-task :default => :test
+  RDBI is a database interface built out of small parts. A micro framework for
+  databases, RDBI works with and extends libraries like 'typelib' and 'epoxy'
+  to provide type conversion and binding facilities. Via a driver/adapter
+  system it provides database access. RDBI itself provides pooling and other
+  enhanced database features.
+  EOF
 
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  self.summary = 'PostgreSQL driver for RDBI';
+  self.url = %w[http://github.com/rdbi/rdbi-driver-postgresql]
+  
+  require_ruby_version ">= 1.8.7"
+
+  extra_dev_deps << ['hoe-roodi']
+  extra_dev_deps << ['hoe-reek']
+  extra_dev_deps << ['minitest']
+
+  extra_deps << ['rdbi']
+  extra_deps << ['pg', '>= 0.10.0']
+
+  desc "install a gem without sudo"
+end
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "rdbi-dbd-postgresql #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+task :install => [:gem] do
+  sh "gem install pkg/#{spec.name}-#{spec.version}.gem"
 end
+# vim: syntax=ruby

data/lib/rdbi/driver/postgresql.rb

@@ -1,9 +1,10 @@
 require 'rdbi'
 require 'epoxy'
-require 'methlab'
 require 'pg'
 
 class RDBI::Driver::PostgreSQL < RDBI::Driver
+  VERSION = "0.9.2"
+
   def initialize( *args )
     super( Database, *args )
   end
@@ -11,8 +12,6 @@ end
 
 class RDBI::Driver::PostgreSQL < RDBI::Driver
   class Database < RDBI::Database
-    extend MethLab
-
     attr_accessor :pg_conn
 
     def initialize( *args )
@@ -29,35 +28,35 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
       )
 
       @preprocess_quoter = proc do |x, named, indexed|
-        @pg_conn.escape_string((named[x] || indexed[x]).to_s)
+        quote(named[x] || indexed[x])
       end
     end
 
     def disconnect
-      @pg_conn.close
       super
+      @pg_conn.close
     end
 
     def transaction( &block )
       if in_transaction?
         raise RDBI::TransactionError.new( "Already in transaction (not supported by PostgreSQL)" )
       end
-      execute 'BEGIN'
-      super &block
+      execute('BEGIN').finish
+      super(&block)
     end
 
     def rollback
       if ! in_transaction?
         raise RDBI::TransactionError.new( "Cannot rollback when not in a transaction" )
       end
-      execute 'ROLLBACK'
+      execute('ROLLBACK').finish
       super
     end
     def commit
       if ! in_transaction?
         raise RDBI::TransactionError.new( "Cannot commit when not in a transaction" )
       end
-      execute 'COMMIT'
+      execute('COMMIT').finish
       super
     end
 
@@ -83,9 +82,20 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
         sch.type = :table
       when 'VIEW'
         sch.type = :view
+      else
+        sch.type = :table
       end
 
-      execute( "SELECT column_name, data_type, is_nullable FROM information_schema.columns WHERE table_schema = ? AND table_name = ?",
+      execute( %q[
+          SELECT c.column_name, c.data_type, c.is_nullable, tc.constraint_type
+          FROM information_schema.columns c
+            LEFT JOIN information_schema.key_column_usage kcu
+              ON kcu.column_name = c.column_name
+              AND kcu.table_name = c.table_name
+              LEFT JOIN information_schema.table_constraints tc
+                ON tc.constraint_name = kcu.constraint_name
+          WHERE c.table_schema = ? and c.table_name = ?
+        ],
         pg_schema,
         table_name
       ).fetch( :all ).each do |row|
@@ -95,6 +105,7 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
         # TODO: ensure this ruby_type is solid, especially re: dates and times
         col.ruby_type  = row[1].to_sym
         col.nullable   = row[2] == "YES"
+        col.primary_key = row[3] == "PRIMARY KEY"
         sch.columns << col
       end
 
@@ -103,7 +114,11 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
 
     def schema( pg_schema = 'public' )
       schemata = []
-      execute( "SELECT table_name FROM information_schema.tables WHERE table_schema = '#{pg_schema}';" ).fetch( :all ).each do |row|
+      execute(%Q[
+        SELECT table_name
+        FROM information_schema.tables
+        WHERE table_schema = '#{pg_schema}'
+      ]).fetch( :all ).each do |row|
         schemata << table_schema( row[0], pg_schema )
       end
       schemata
@@ -127,6 +142,21 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
         raise RDBI::DisconnectedError, "disconnected during ping"
       end
     end
+
+    def quote(item)
+      case item
+      when Numeric
+        item.to_s
+      when TrueClass
+        'true'
+      when FalseClass
+        'false'
+      when NilClass
+        'NULL'
+      else
+        "E'#{@pg_conn.escape_string(item.to_s)}'"
+      end
+    end
   end
 
   class Cursor < RDBI::Cursor
@@ -178,7 +208,7 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
     def [](index)
       fix_dates(@handle[index].values)
     end
-    
+
     def last_row?
       @index == result_count
     end
@@ -209,18 +239,21 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
         ary << row
       end
       # XXX end stupid rectifier.
-      
+
       return ary
     end
 
     def fix_dates(values)
       index = 0
 
+      columns = @schema.columns
+
       values.collect! do |val|
         if val.kind_of?(Array)
           index2 = 0
           val.collect! do |col|
-            if !col.nil? and @schema.columns[index2].type == 'timestamp without time zone'
+            ctype = columns[index2].type
+            if !col.nil? && ctype.start_with?('timestamp') && ctype =~ /timestamp(?:\(\d\d?\))? without time zone/
               col << @stub_datetime
             end
 
@@ -228,7 +261,8 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
             col
           end
         else
-          if !val.nil? and @schema.columns[index].type == 'timestamp without time zone'
+          ctype = columns[index].type
+          if !val.nil? && ctype.start_with?('timestamp') && ctype =~ /timestamp(?:\(\d\d?\))? without time zone/
             val << @stub_datetime
           end
         end
@@ -242,24 +276,24 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
   end
 
   class Statement < RDBI::Statement
-    extend MethLab
-
     attr_accessor :pg_result
-    attr_threaded_accessor :stmt_name
+    attr_accessor :stmt_name
 
     def initialize( query, dbh )
       super( query, dbh )
-      @stmt_name = Time.now.to_f.to_s
+      @stmt_name = ('stmt_' + Time.now.to_f.to_s).tr('.', '_')
 
       ep = Epoxy.new( query )
       @index_map = ep.indexed_binds
       query = ep.quote(Hash[@index_map.compact.zip([])]) do |x|
         case x
         when Integer
-          "$#{x+1}" 
+          "$#{x+1}"
         when Symbol
           num = @index_map.index(x)
           "$#{num+1}"
+        else
+          x
         end
       end
 
@@ -272,18 +306,45 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
       @output_type_map = RDBI::Type.create_type_hash( RDBI::Type::Out )
       @output_type_map[ :bigint ] = RDBI::Type.filterlist( RDBI::Type::Filters::STR_TO_INT )
 
-      prep_finalizer { @pg_result.clear }
+      # PostgreSQL returns timestamps with and without subseconds.
+      # RDBI by default doesn't handle timestamps with subseconds,
+      # so here we account for that in our PostgreSQL driver
+      check = proc do |obj|
+        begin
+          if obj.include?('.')
+            format = "%Y-%m-%d %H:%M:%S.%N %z"
+            converted_and_back = DateTime.strptime(obj, format).strftime(format)
+            # Strip trailing zeros in subseconds
+            converted_and_back.gsub(/\.(\d+?)0* /, ".\\1 ") == obj.gsub(/\.(\d+?)0* /, ".\\1 ")
+          else
+            format = "%Y-%m-%d %H:%M:%S %z"
+            DateTime.strptime(obj, format).strftime(format) == obj
+          end
+        rescue ArgumentError => e
+          if e.message == 'invalid date'
+            false
+          else
+            raise e
+          end
+        end
+      end
+      convert = proc do |obj|
+        if obj.include?('.')
+          DateTime.strptime(obj, "%Y-%m-%d %H:%M:%S.%N %z")
+        else
+          DateTime.strptime(obj, "%Y-%m-%d %H:%M:%S %z")
+        end
+      end
+      @output_type_map[ :timestamp ] = RDBI::Type.filterlist( TypeLib::Filter.new(check, convert) )
+
+      @finish_block = Proc.new {
+        @dbh.pg_conn.exec("DEALLOCATE #{@stmt_name}")
+        @pg_result.clear
+      }
     end
 
     def new_modification(*binds)
-      # FIXME move to RDBI::Util or something.
-      hashes, binds = binds.partition { |x| x.kind_of?(Hash) }
-      hash = hashes.inject({}) { |x, y| x.merge(y) }
-      hash.keys.each do |key| 
-        if index = @index_map.index(key)
-          binds.insert(index, hash[key])
-        end
-      end
+      binds = RDBI::Util.index_binds(binds, @index_map)
 
       pg_result = @dbh.pg_conn.exec_prepared( @stmt_name, binds )
       return pg_result.cmd_tuples
@@ -291,18 +352,11 @@ class RDBI::Driver::PostgreSQL < RDBI::Driver
 
     # Returns an Array of things used to fill out the parameters to RDBI::Result.new
     def new_execution( *binds )
-      # FIXME move to RDBI::Util or something.
-      hashes, binds = binds.partition { |x| x.kind_of?(Hash) }
-      hash = hashes.inject({}, :merge)
-      hash.each do |key, value|
-        if index = @index_map.index(key)
-          binds.insert(index, value)
-        end
-      end
+      binds = RDBI::Util.index_binds(binds, @index_map)
 
       pg_result = @dbh.pg_conn.exec_prepared( @stmt_name, binds )
 
-      columns = [] 
+      columns = []
       column_query = (0...pg_result.num_fields).map do |x|
         "format_type(#{ pg_result.ftype(x) }, #{ pg_result.fmod(x) }) as col#{x}"
       end.join(", ")

data/rdbi-driver-postgresql.gemspec

@@ -14,14 +14,12 @@ Gem::Specification.new do |s|
   s.email = %q{rdbi@pistos.oib.com}
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc"
+    "README.txt"
   ]
   s.files = [
-    "LICENCE",
     "LICENSE",
-    "README.rdoc",
+    "README.txt",
     "Rakefile",
-    "VERSION",
     "lib/rdbi-driver-postgresql.rb",
     "lib/rdbi/driver/postgresql.rb",
     "rdbi-driver-postgresql.gemspec",

data/test/helper.rb

@@ -1,22 +1,22 @@
 require 'rubygems'
-gem 'test-unit'
 require 'test/unit'
 require 'fileutils'
-gem 'pg', '= 0.9.0'
-gem 'rdbi-dbrc'
 require 'rdbi-dbrc'
 require 'rdbi/driver/postgresql'
 
 class Test::Unit::TestCase
 
   SQL = [
+    'set client_min_messages = warning',
     'DROP TABLE IF EXISTS foo',
     'DROP TABLE IF EXISTS bar',
     'DROP TABLE IF EXISTS time_test',
+    'DROP TABLE IF EXISTS time_test2',
     'DROP TABLE IF EXISTS ordinals',
     'create table foo (bar integer)',
     'create table bar (foo varchar, bar integer)',
-    'create table time_test (my_date timestamp)',
+    'create table time_test (id SERIAL PRIMARY KEY, my_date timestamp)',
+    'create table time_test2 (id SERIAL PRIMARY KEY, ts TIMESTAMP(0) WITHOUT TIME ZONE)',
     'CREATE TABLE ordinals ( id SERIAL PRIMARY KEY, cardinal INTEGER, s VARCHAR )',
     "INSERT INTO ordinals ( cardinal, s ) VALUES ( 1, 'first' )",
     "INSERT INTO ordinals ( cardinal, s ) VALUES ( 2, 'second' )",
@@ -30,7 +30,7 @@ class Test::Unit::TestCase
   def init_database
     dbh = new_database
     SQL.each { |query| dbh.execute_modification(query) }
-    return dbh
+    dbh
   end
 
   def role

data/test/test_database.rb

@@ -28,7 +28,7 @@ class TestDatabase < Test::Unit::TestCase
     assert_kind_of(Numeric, RDBI.ping(driver, my_role))
     dbh.disconnect
 
-    assert_raises(RDBI::DisconnectedError.new("not connected")) do
+    assert_raises(RDBI::DisconnectedError) do
       dbh.ping
     end
 
@@ -182,7 +182,7 @@ class TestDatabase < Test::Unit::TestCase
 
     dt = DateTime.now
     dbh.execute_modification( 'insert into time_test (my_date) values (?)', dt )
-    dt2 = dbh.execute( 'select * from time_test limit 1' ).fetch(1)[0][0]
+    dt2 = dbh.execute( 'select my_date from time_test limit 1' ).fetch(1)[0][0]
 
     assert_kind_of( DateTime, dt2 )
     assert_equal( dt2.to_s, dt.to_s )
@@ -190,9 +190,67 @@ class TestDatabase < Test::Unit::TestCase
     dbh.execute 'INSERT INTO time_test ( my_date ) VALUES ( NULL )'
     dt3 = "not nil"
     assert_nothing_raised do
-      dt3 = dbh.execute( 'SELECT * FROM time_test WHERE my_date IS NULL LIMIT 1' ).fetch( 1 )[0][0]
+      dt3 = dbh.execute( 'SELECT my_date FROM time_test WHERE my_date IS NULL LIMIT 1' ).fetch( 1 )[0][0]
     end
     assert_nil dt3
+
+    dbh.execute_modification "INSERT INTO time_test ( my_date ) VALUES ( CAST( '2011-08-30 06:57:38.1375-04' AS TIMESTAMP(0) WITH TIME ZONE ) )"
+    dt = dbh.execute( 'SELECT my_date FROM time_test WHERE my_date IS NOT NULL ORDER BY id DESC LIMIT 1' ).fetch(1)[0][0]
+    assert_kind_of  DateTime, dt
+
+    dbh.execute_modification "INSERT INTO time_test ( my_date ) VALUES ( CAST( '2011-08-30 06:57:38.1375-04' AS TIMESTAMP(1) WITH TIME ZONE ) )"
+    dt = dbh.execute( 'SELECT my_date FROM time_test WHERE my_date IS NOT NULL ORDER BY id DESC LIMIT 1' ).fetch(1)[0][0]
+    assert_kind_of  DateTime, dt
+
+    dbh.execute_modification "INSERT INTO time_test ( my_date ) VALUES ( CAST( '2011-08-30 06:57:38.1375-04' AS TIMESTAMP WITH TIME ZONE ) )"
+    dt = dbh.execute( 'SELECT my_date FROM time_test WHERE my_date IS NOT NULL ORDER BY id DESC LIMIT 1' ).fetch(1)[0][0]
+    assert_kind_of  DateTime, dt
+
+    dbh.execute_modification "INSERT INTO time_test ( my_date ) VALUES ( '2011-08-30 11:32:36.802597'::TIMESTAMP )"
+    dt = dbh.execute( 'SELECT my_date FROM time_test WHERE my_date IS NOT NULL ORDER BY id DESC LIMIT 1' ).fetch(1)[0][0]
+    assert_kind_of  DateTime, dt
+
+    dbh.execute_modification "INSERT INTO time_test ( my_date ) VALUES ( CAST( '2011-08-30 06:57:38.1375' AS TIMESTAMP ) )"
+    dt = dbh.execute( 'SELECT my_date FROM time_test WHERE my_date IS NOT NULL ORDER BY id DESC LIMIT 1' ).fetch(1)[0][0]
+    assert_kind_of  DateTime, dt
+
+    dbh.execute_modification "INSERT INTO time_test ( my_date ) VALUES ( CAST( '2011-08-30 06:57:38' AS TIMESTAMP ) )"
+    dt = dbh.execute( 'SELECT my_date FROM time_test WHERE my_date IS NOT NULL ORDER BY id DESC LIMIT 1' ).fetch(1)[0][0]
+    assert_kind_of  DateTime, dt
+
+    dbh.execute_modification 'INSERT INTO time_test ( my_date ) VALUES ( CURRENT_TIMESTAMP(0) )'
+    dt = dbh.execute( 'SELECT my_date FROM time_test WHERE my_date IS NOT NULL ORDER BY id DESC LIMIT 1' ).fetch(1)[0][0]
+    assert_kind_of  DateTime, dt
+
+    dbh.execute_modification 'INSERT INTO time_test ( my_date ) VALUES ( CURRENT_TIMESTAMP(2) )'
+    dt = dbh.execute( 'SELECT id, my_date FROM time_test WHERE my_date IS NOT NULL ORDER BY id DESC LIMIT 1' ).fetch(1)[0][1]
+    assert_kind_of  DateTime, dt
+
+    dbh.execute_modification 'INSERT INTO time_test ( my_date ) VALUES ( CURRENT_TIMESTAMP )'
+    dt = dbh.execute( 'SELECT my_date, id FROM time_test WHERE my_date IS NOT NULL ORDER BY id DESC LIMIT 1' ).fetch(1)[0][0]
+    assert_kind_of  DateTime, dt
+
+    dbh.execute_modification 'INSERT INTO time_test ( my_date ) VALUES ( NOW() )'
+    dt = dbh.execute( 'SELECT id, my_date FROM time_test WHERE my_date IS NOT NULL ORDER BY id DESC LIMIT 1' ).fetch(1)[0][1]
+    assert_kind_of  DateTime, dt
+
+    dbh.execute_modification 'INSERT INTO time_test2 ( ts ) VALUES ( CURRENT_TIMESTAMP(0) )'
+    ts = dbh.execute( 'SELECT id, ts FROM time_test2 ORDER BY id DESC LIMIT 1' ).fetch(1)[0][1]
+    assert_kind_of  DateTime, ts
+
+    rows = [ 'not empty' ]
+    assert_nothing_raised do
+      rows = dbh.execute( 'SELECT id, ts FROM time_test2 WHERE id = -1' ).fetch(1)
+    end
+    assert_empty rows
+
+    dbh.execute_modification "INSERT INTO time_test ( my_date ) VALUES ( CAST( '2011-08-30 06:57:38.1375' AS TIMESTAMP ) )"
+    dbh.execute_modification "INSERT INTO time_test ( my_date ) VALUES ( CAST( '2011-08-30 06:50:00' AS TIMESTAMP ) )"
+    rows = dbh.execute( 'SELECT my_date FROM time_test WHERE my_date IS NOT NULL ORDER BY id DESC LIMIT 2' ).fetch(2)
+    rows.each do |row|
+      assert_kind_of  DateTime, row[0]
+    end
+
   end
 
   def test_09_basic_schema
@@ -200,11 +258,12 @@ class TestDatabase < Test::Unit::TestCase
     assert_respond_to( dbh, :schema )
     schema = dbh.schema.sort_by { |x| x.tables[0].to_s }
 
-    tables = [ :bar, :foo, :ordinals, :time_test ]
+    tables = [ :bar, :foo, :ordinals, :time_test, :time_test2 ]
     columns = {
       :bar => { :foo => 'character varying'.to_sym, :bar => :integer },
       :foo => { :bar => :integer },
-      :time_test => { :my_date => 'timestamp without time zone'.to_sym },
+      :time_test => { :id => :integer, :my_date => 'timestamp without time zone'.to_sym },
+      :time_test2 => { :id => :integer, :ts => 'timestamp without time zone'.to_sym },
       :ordinals => {
         :id => :integer,
         :cardinal => :integer,
@@ -235,6 +294,10 @@ class TestDatabase < Test::Unit::TestCase
     self.dbh = init_database
     assert_respond_to( dbh, :table_schema )
 
+    assert(dbh.table_schema('ordinals').columns.find {|x| x.name == :id }.primary_key)
+    assert(!dbh.table_schema('ordinals').columns.find {|x| x.name == :cardinal }.primary_key)
+    assert(!dbh.table_schema('ordinals').columns.find {|x| x.name == :s }.primary_key)
+
     schema = dbh.table_schema( :foo )
     columns = schema.columns
     assert_equal columns.size, 1
@@ -245,12 +308,12 @@ class TestDatabase < Test::Unit::TestCase
     schema = dbh.table_schema( :bar )
     columns = schema.columns
     assert_equal columns.size, 2
-    columns.each do |c|
-      case c.name
+    columns.each do |col|
+      case col.name
       when :foo
-        assert_equal c.type, 'character varying'.to_sym
+        assert_equal col.type, 'character varying'.to_sym
       when :bar
-        assert_equal c.type, :integer
+        assert_equal col.type, :integer
       end
     end
 
@@ -263,11 +326,11 @@ class TestDatabase < Test::Unit::TestCase
     res = dbh.execute("select id, cardinal, s from ordinals where id = ?id", { :id => 1 })
     assert(res)
     assert_equal([[1, 1, 'first']], res.fetch(:all))
-   
+
     res = dbh.execute("select id, cardinal, s from ordinals where id = ?id and cardinal = ?", { :id => 1 }, 1)
     assert(res)
     assert_equal([[1, 1, 'first']], res.fetch(:all))
-    
+
     res = dbh.execute("select id, cardinal, s from ordinals where id = ?id and cardinal = ?", 1, { :id => 1 })
     assert(res)
     assert_equal([[1, 1, 'first']], res.fetch(:all))
@@ -289,9 +352,9 @@ class TestDatabase < Test::Unit::TestCase
     assert_equal(results[2].id, 3)
     assert_equal(results[2].cardinal, 3)
     assert_equal(results[2].s, 'third')
-    
+
     results = dbh.execute("select * from ordinals order by id").as(:Struct).fetch(:all)
-    
+
     assert(results)
     assert_kind_of(Array, results)
     assert_equal(results[0].id, 1)
@@ -303,7 +366,7 @@ class TestDatabase < Test::Unit::TestCase
     assert_equal(results[2].id, 3)
     assert_equal(results[2].cardinal, 3)
     assert_equal(results[2].s, 'third')
-    
+
     result = dbh.execute("select * from ordinals order by id").as(:Struct).fetch(:first)
     assert(result)
     assert_kind_of(Struct, result)
@@ -311,4 +374,15 @@ class TestDatabase < Test::Unit::TestCase
     assert_equal(result.cardinal, 1)
     assert_equal(result.s, 'first')
   end
+
+  def test_13_quote
+    self.dbh = init_database
+
+    assert_equal(%q[1], dbh.quote(1))
+    assert_equal(%q[false], dbh.quote(false))
+    assert_equal(%q[true], dbh.quote(true))
+    assert_equal(%q[NULL], dbh.quote(nil))
+    assert_equal(%q[E'shit'], dbh.quote('shit'))
+    assert_equal(%q[E'shit''t'], dbh.quote('shit\'t'))
+  end
 end

metadata

@@ -1,170 +1,151 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rdbi-driver-postgresql
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 1
-  version: 0.9.1
+version: !ruby/object:Gem::Version
+  version: 0.9.2
 platform: ruby
-authors: 
+authors:
 - Pistos
 - Erik Hollensbe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-10 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: test-unit
+date: 2013-06-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdbi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: hoe-roodi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdbi-dbrc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hoe-reek
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdbi
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: pg
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: methlab
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: epoxy
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 1
-        version: 0.3.1
-  type: :runtime
-  version_requirements: *id007
-description: PostgreSQL driver for RDBI
-email: rdbi@pistos.oib.com
-executables: []
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+description: |2
+    This is the PostgreSQL driver for RDBI.
 
+    RDBI is a database interface built out of small parts. A micro framework for
+    databases, RDBI works with and extends libraries like 'typelib' and 'epoxy'
+    to provide type conversion and binding facilities. Via a driver/adapter
+    system it provides database access. RDBI itself provides pooling and other
+    enhanced database features.
+email:
+- pistos@purepistos.net
+- erik@hollensbe.org
+executables: []
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- LICENCE
+extra_rdoc_files:
+- Manifest.txt
+- README.txt
+files:
 - LICENSE
-- README.rdoc
+- Manifest.txt
+- README.txt
 - Rakefile
-- VERSION
 - lib/rdbi-driver-postgresql.rb
 - lib/rdbi/driver/postgresql.rb
 - rdbi-driver-postgresql.gemspec
 - test/helper.rb
 - test/test_database.rb
-has_rdoc: true
-homepage: http://github.com/Pistos/rdbi-dbd-postgresql
+- .gemtest
+homepage: http://github.com/rdbi/rdbi-driver-postgresql
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: []
-
-require_paths: 
+rdoc_options:
+- --main
+- README.txt
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: 1.8.7
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: PostgreSQL driver for RDBI
-test_files: 
-- test/helper.rb
+test_files:
 - test/test_database.rb

data/LICENCE

@@ -1,21 +0,0 @@
-The MIT Licence
-
-Copyright (c) 2010 Pistos
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/VERSION

@@ -1 +0,0 @@
-0.9.1