sqlpostgres 1.2.6 → 1.3.0

data/Changelog.md

@@ -0,0 +1,18 @@
+### 1.3.0
+
+Enhancements
+
+* Support Postgresql 9
+* Some tests converted to rspec
+* Connection can set client encoding
+* More adaptable configuration for databases to run tests against
+
+### 1.2.6
+
+Bug fixes
+
+* DateTime objects store their full precision
+
+### 1.2.4
+
+* First public release

data/Gemfile

@@ -4,5 +4,7 @@ gem 'pg', '~> 0.13.2'
 
 group :development do
   gem 'jeweler', '~> 1.8.4'
+  gem 'memoizer', '~> 1.0.1'
   gem 'rake', '~> 10.0.3'
+  gem 'rspec', '~> 2.12.0'
 end

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.3)
     git (1.2.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -8,15 +9,26 @@ GEM
       rake
       rdoc
     json (1.7.6)
+    memoizer (1.0.1)
     pg (0.13.2)
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   jeweler (~> 1.8.4)
+  memoizer (~> 1.0.1)
   pg (~> 0.13.2)
   rake (~> 10.0.3)
+  rspec (~> 2.12.0)

data/README.rdoc

@@ -47,8 +47,7 @@ The tests are known to pass in MRI 1.8.7 and MRI 1.9.3
 
 == POSTGRES VERSIONS
 
-This library works with Postgres 1.8.  It does not yet fully support
-Postgres 1.9.
+This library works with Postgres 1.8 and Postgres 1.9.
 
 == ENCODINGS
 
@@ -57,3 +56,7 @@ This library only works properly with the SQL-ASCII encoding.
 == WHOAMI
 
 Wayne Conrad <wconrad@yagni.com>
+
+== CONTRIBUTORS
+
+Sam Kellogg <sam@nickstoys.com>

data/Rakefile

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require 'rubygems'
-
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -10,28 +10,9 @@ rescue Bundler::BundlerError => e
   $stderr.puts 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
-require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see
-  #  http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = 'sqlpostgres'
-  gem.homepage = 'http://github.com/wconrad/sqlpostgres'
-  gem.license = 'MIT'
-  gem.summary = %Q{library for postgresql queries}
-  gem.description =
-    ('A mini-language for building and executing SQL statements '\
-     'against a postgresql database.  This is a very old library, '\
-     'pre-dating active record and lacking many of its refinments.  '\
-     'New projects will probably not want to use it.')
-  gem.email = 'wconrad@yagni.com'
-  gem.authors = ['Wayne Conrad']
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+$:.unshift(File.dirname(__FILE__) + '/lib')
+Dir['rake_tasks/**/*.rake'].sort.each { |path| load path }
 
-desc "Run Tests"
-task :test do
-  system 'test/test'
-end
+require File.expand_path('spec/lib/target_database_servers',
+                         File.dirname(__FILE__))

data/VERSION

@@ -1 +1 @@
-1.2.6
+1.3.0

data/lib/sqlpostgres/Connection.rb

@@ -83,6 +83,8 @@ module SqlPostgres
     #    to nil.
     # 'password'::
     #    Password.  nil, the default, means no password.
+    # 'encoding'::
+    #    Client encoding.
     #
     # To wrap an existing connection, pass this argument:
     #
@@ -107,12 +109,15 @@ module SqlPostgres
         tty = args['tty'] || ""
         login = args['login']
         password = args['password']
+        client_encoding = args['encoding']
         @pgconn = @@pgClass.connect(hostName, port, options, tty, dbName, 
                                     login, password)
+        if client_encoding
+          @pgconn.set_client_encoding(client_encoding)
+        end
       end
       @statement_in_exception = args['statement_in_exception']
       @statement_in_exception = true if @statement_in_exception.nil?
-      @pgconn.set_client_encoding("unicode")
     end
 
     # close the connection.  If it's already closed, do nothing.
@@ -177,8 +182,8 @@ module SqlPostgres
           unless column.converter.nil?
             typeCode = pgresult.ftype(i)
             value = row[i]
-            args = [value]
-            args << typeCode if column.converter.arity == 2
+            args = [value, @pgconn]
+            args << typeCode if column.converter.arity == 3
             hash[column.as || column.value] = 
               value && column.converter.call(*args)
           end

data/lib/sqlpostgres/Cursor.rb

@@ -101,8 +101,8 @@ module SqlPostgres
       @connection.exec(statement)
     end
 
-    # Close the cursor.  Once closed, it may closed or fetched from
-    # again.
+    # Close the cursor.  Once closed, it may not be closed or fetched
+    # from again.
 
     def close
       statement = "close #{@name}"

data/lib/sqlpostgres/Insert.rb

@@ -140,7 +140,7 @@ module SqlPostgres
 
     def insert_bytea(column, value = :no_value)
       @columns << column
-      @values << Translate.escape_bytea(value) unless value == :no_value
+      @values << Translate.escape_bytea(value, @connection.pgconn) unless value == :no_value
     end
 
     # Insert into a bytea[] (bytea array) column.  You must use this

data/lib/sqlpostgres/PgBit.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgType'
+require File.expand_path('PgType', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgBox.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgTwoPoints'
+require File.expand_path('PgTwoPoints', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgCidr.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgWrapper'
+require File.expand_path('PgWrapper', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgCircle.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgType'
+require File.expand_path('PgType', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgInet.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgWrapper'
+require File.expand_path('PgWrapper', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgInterval.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgType'
+require File.expand_path('PgType', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgLineSegment.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgTwoPoints'
+require File.expand_path('PgTwoPoints', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgMacAddr.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgWrapper'
+require File.expand_path('PgWrapper', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgPath.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgType'
+require File.expand_path('PgType', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgPoint.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgType'
+require File.expand_path('PgType', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgPolygon.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "PgType")
+require File.expand_path('PgType', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgTime.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgType'
+require File.expand_path('PgType', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgTimeWithTimeZone.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgType'
+require File.expand_path('PgType', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgTimestamp.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgType'
+require File.expand_path('PgType', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgTwoPoints.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgType'
+require File.expand_path('PgType', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/PgWrapper.rb

@@ -1,4 +1,4 @@
-require 'sqlpostgres/PgType'
+require File.expand_path('PgType', File.dirname(__FILE__))
 
 module SqlPostgres
 

data/lib/sqlpostgres/Select.rb

@@ -609,29 +609,29 @@ module SqlPostgres
 
     # Converters used to translate strings into Ruby types.
 
-    BitConverter = proc { |s| PgBit.from_sql(s) }
-    BooleanConverter = proc { |s| s == 't' }
-    BoxConverter = proc { |s| PgBox.from_sql(s) }
-    ByteaConverter = proc { |s| Translate.unescape_bytea(s) }
-    CidrConverter = proc { |s| PgCidr.from_sql(s) }
-    CircleConverter = proc { |s| PgCircle.from_sql(s) }
-    DateConverter = proc { |s| Translate.sql_to_date(s) }
-    FloatConverter = proc { |s| s.to_f }
-    InetConverter = proc { |s| PgInet.from_sql(s) }
-    IntegerConverter = proc { |s| s.to_i }
-    IntervalConverter = proc { |s| PgInterval.from_sql(s) }
-    LsegConverter = proc { |s| PgLineSegment.from_sql(s) }
-    MacAddrConverter = proc { |s| PgMacAddr.from_sql(s) }
-    PathConverter = proc { |s| PgPath.from_sql(s) }
-    PointConverter = proc { |s| PgPoint.from_sql(s) }
-    PolygonConverter = proc { |s| PgPolygon.from_sql(s) }
-    QCharConverter = proc { |s| Translate.unescape_qchar(s) }
-    StringConverter = proc { |s| s }
-    TimeConverter = proc { |s| PgTime.from_sql(s) }
-    TimeStringConverter = proc { |s| Time.local(*s.split(/:/)) }
-    TimeWithTimeZoneConverter = proc { |s| PgTimeWithTimeZone.from_sql(s) }
-    TimestampConverter = proc { |s| PgTimestamp.from_sql(s) }
-    TimestampTzConverter = proc { |s| Translate.sql_to_datetime(s) }
+    BitConverter = proc { |s, server_version| PgBit.from_sql(s) }
+    BooleanConverter = proc { |s, server_version| s == 't' }
+    BoxConverter = proc { |s, server_version| PgBox.from_sql(s) }
+    ByteaConverter = proc { |s, server_version| Translate.unescape_bytea(s, server_version) }
+    CidrConverter = proc { |s, server_version| PgCidr.from_sql(s) }
+    CircleConverter = proc { |s, server_version| PgCircle.from_sql(s) }
+    DateConverter = proc { |s, server_version| Translate.sql_to_date(s) }
+    FloatConverter = proc { |s, server_version| s.to_f }
+    InetConverter = proc { |s, server_version| PgInet.from_sql(s) }
+    IntegerConverter = proc { |s, server_version| s.to_i }
+    IntervalConverter = proc { |s, server_version| PgInterval.from_sql(s) }
+    LsegConverter = proc { |s, server_version| PgLineSegment.from_sql(s) }
+    MacAddrConverter = proc { |s, server_version| PgMacAddr.from_sql(s) }
+    PathConverter = proc { |s, server_version| PgPath.from_sql(s) }
+    PointConverter = proc { |s, server_version| PgPoint.from_sql(s) }
+    PolygonConverter = proc { |s, server_version| PgPolygon.from_sql(s) }
+    QCharConverter = proc { |s, server_version| Translate.unescape_qchar(s) }
+    StringConverter = proc { |s, server_version| s }
+    TimeConverter = proc { |s, server_version| PgTime.from_sql(s) }
+    TimeStringConverter = proc { |s, server_version| Time.local(*s.split(/:/)) }
+    TimeWithTimeZoneConverter = proc { |s, server_version| PgTimeWithTimeZone.from_sql(s) }
+    TimestampConverter = proc { |s, server_version| PgTimestamp.from_sql(s) }
+    TimestampTzConverter = proc { |s, server_version| Translate.sql_to_datetime(s) }
 
     # Map each base (non-array) type to a converter.
 
@@ -705,7 +705,7 @@ module SqlPostgres
       Types::ARRAY_VARCHAR => Types::VARCHAR,
     }
 
-    AutoConverter = proc { |s, type_code|
+    AutoConverter = proc { |s, pgconn, type_code|
       array_element_type = ARRAY_ELEMENT_TYPES[type_code]
       if !array_element_type.nil?
         s = Translate.sql_to_array(s)
@@ -713,7 +713,7 @@ module SqlPostgres
       end
       converter = CONVERTERS[type_code] || StringConverter
       Translate.deep_collect(s) do |e|
-        converter.call(e)
+        converter.call(e, pgconn)
       end
     }
 

data/lib/sqlpostgres/Translate.rb

@@ -270,45 +270,23 @@ module SqlPostgres
     #   \ 
     #   \x7f-\xff
 
-    def escape_bytea(s)
+    def escape_bytea(s, pgconn)
       return "null" if s.nil?
       return "default" if s == :default
-      "E'" + PGconn.escape_bytea(Array(s).join) + "'"
+      raise s.inspect if s.is_a?(Array) #DEBUG
+      value = "'" + pgconn.escape_bytea(s) + "'"
+      value = "E" + value if pgconn.server_version < 9_01_00
+      value
     end
     module_function :escape_bytea
 
-    # Unescape octal escape sequences, turning them back into bytes.
-
-    def unescape_octal_escapes(s)
-      s.gsub(/\\(\d{3})/) do
-        $1.oct.chr
-      end.gsub(/\\\\/, '\\')
-    end
-    module_function :unescape_octal_escapes
-
     # Unescape a bytea string read from postgres.
 
-    def unescape_bytea(s)
-      if s.respond_to?(:force_encoding)
-        s = s.force_encoding("ASCII-8BIT")
-      end
-      s.gsub(/\\(\\|[0-3][0-7][0-7])/) do
-        if $1 == "\\"
-          "\\"
-        else
-          $1.oct.chr
-        end
-      end
+    def unescape_bytea(s, pgconn)
+      pgconn.unescape_bytea(s)
     end
     module_function :unescape_bytea
 
-    # Unescape a text string read from postges.
-
-    def unescape_text(s)
-      unescape_bytea(s)
-    end
-    module_function :unescape_text
-
     # Convert a time to SQL format, including microseconds:
     # (YYYY-mm-dd HH:MM:SS.uuuuuu)
 

data/lib/sqlpostgres/Update.rb

@@ -99,7 +99,7 @@ module SqlPostgres
     #**
 
     def set_bytea(column, value)
-      @set_clauses << [column, Translate.escape_bytea(value)].join(' = ')
+      @set_clauses << [column, Translate.escape_bytea(value, @connection.pgconn)].join(' = ')
     end
 
     # Set a column to an array.

data/rake_tasks/db.rake

@@ -0,0 +1,17 @@
+namespace 'test:db' do
+
+  def target_database_servers
+    TestSupport::TargetDatabaseServers.instance
+  end
+
+  desc 'Create test databases'
+  task 'create' do
+    target_database_servers.create_databases
+  end
+
+  desc 'Drop test databases'
+  task 'drop' do
+    target_database_servers.drop_databases
+  end
+
+end