swift-db-postgres 0.2.7 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.3.0 (2013-02-19)
+
+* supports encoding option while connecting. 
+
 == 0.2.7 (2012-11-22)
 
 * rb_gc_register_address() the bind values.

data/README.md

@@ -47,6 +47,26 @@ MRI adapter for PostgreSQL
     #insert_id
 ```
 
+## Connection options
+
+```
+╭────────────────────╥────────────┬─────────────╮
+│ Name               ║  Default   │  Optional   │
+╞════════════════════╬════════════╪═════════════╡
+│ db                 ║  -         │  No         │
+│ host               ║  127.0.0.1 │  Yes        │
+│ port               ║  5432      │  Yes        │
+│ user               ║  Etc.login │  Yes        │
+│ password           ║  nil       │  Yes        │
+│ encoding           ║  utf8      │  Yes        │
+│ ssl[:sslmode]      ║  allow     │  Yes        │
+│ ssl[:sslcert]      ║  nil       │  Yes        │
+│ ssl[:sslkey]       ║  nil       │  Yes        │
+│ ssl[:sslrootcert]  ║  nil       │  Yes        │
+│ ssl[:sslcrl]       ║  nil       │  Yes        │
+└────────────────────╨────────────┴─────────────┘
+```
+
 ## Bind parameters and hstore operators
 
 Swift::DB::Postgres uses '?' as a bind parameter and replaces them with the '$' equivalents. This causes issues when
@@ -68,7 +88,7 @@ end
 ```ruby
 require 'swift/db/postgres'
 
-db = Swift::DB::Postgres.new(db: 'swift_test')
+db = Swift::DB::Postgres.new(db: 'swift_test', encoding: 'utf8')
 
 db.execute('drop table if exists users')
 db.execute('create table users (id serial, name text, age integer, created_at timestamp)')

data/ext/swift/db/postgres/adapter.c

@@ -62,7 +62,7 @@ void append_ssl_option(char *buffer, int size, VALUE ssl, char *key, char *fallb
 
 VALUE db_postgres_adapter_initialize(VALUE self, VALUE options) {
     char *connection_info;
-    VALUE db, user, pass, host, port, ssl;
+    VALUE db, user, pass, host, port, ssl, enc;
     Adapter *a = db_postgres_adapter_handle(self);
 
     if (TYPE(options) != T_HASH)
@@ -74,6 +74,7 @@ VALUE db_postgres_adapter_initialize(VALUE self, VALUE options) {
     host = rb_hash_aref(options, ID2SYM(rb_intern("host")));
     port = rb_hash_aref(options, ID2SYM(rb_intern("port")));
     ssl  = rb_hash_aref(options, ID2SYM(rb_intern("ssl")));
+    enc  = rb_hash_aref(options, ID2SYM(rb_intern("encoding")));
 
     if (NIL_P(db))
         rb_raise(eSwiftConnectionError, "Invalid db name");
@@ -83,6 +84,8 @@ VALUE db_postgres_adapter_initialize(VALUE self, VALUE options) {
         port = rb_str_new2("5432");
     if (NIL_P(user))
         user = sUser;
+    if (NIL_P(enc))
+        enc = rb_str_new2("utf8");
 
     if (!NIL_P(ssl) && TYPE(ssl) != T_HASH)
             rb_raise(eSwiftArgumentError, "ssl options needs to be a hash");
@@ -108,7 +111,8 @@ VALUE db_postgres_adapter_initialize(VALUE self, VALUE options) {
         rb_raise(eSwiftConnectionError, PQerrorMessage(a->connection));
 
     PQsetNoticeProcessor(a->connection, (PQnoticeProcessor)db_postgres_adapter_notice, (void*)self);
-    PQsetClientEncoding(a->connection, "utf8");
+    if (PQsetClientEncoding(a->connection, CSTRING(enc)) != 0)
+        rb_raise(eSwiftConnectionError, PQerrorMessage(a->connection));
     return self;
 }
 

data/test/test_adapter.rb

@@ -5,6 +5,14 @@ describe 'postgres adapter' do
     assert db
   end
 
+  it 'it should allow custom encoding' do
+    assert Swift::DB::Postgres.new(db: 'swift_test', encoding: 'utf8')
+  end
+
+  it 'should raise connection error on not so awesome encoding' do
+    assert_raises(Swift::ConnectionError) {Swift::DB::Postgres.new(db: 'swift_test', encoding: 'not_awesome')}
+  end
+
   it 'should execute sql' do
     assert db.execute("select * from pg_tables")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake