From ed9425985972858cc678c1a5f1a83bc62b93c26f Mon Sep 17 00:00:00 2001
From: Niklaus Giger <ngiger@ywesee.com>
Date: Wed, 13 Dec 2017 12:33:34 +0100
Subject: [PATCH] Used odba 1.1.4 for postgres 10. Remove dictionary from index
 definitions

---
 Gemfile                    |  4 ++--
 Gemfile.lock               | 17 +++++++----------
 etc/index_definitions.yaml |  3 +--
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 89f763b..261f713 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem 'minitar'
 gem 'bigdecimal'#, '1.1.0'
 gem 'builder'
 gem 'clogger'
-gem 'dbd-pg', '0.3.9'
+gem 'ydbd-pg', '0.5.4'
 gem 'ydiffy'
 gem 'deprecated', '2.0.1'
 gem 'facets', '1.8.54'
@@ -30,7 +30,7 @@ gem 'net-http-digest_auth'#, '1.2'
 gem 'net-http-persistent'# , '2.7'
 gem 'nokogiri'# , '1.6.1'
 gem 'ox', '2.8.2' # a replacement for nokogir
-gem 'odba',  '>= 1.1.2'
+gem 'odba',  '>= 1.1.4'
 gem 'oddb2tdat', '1.1.2'
 gem 'activesupport', '~> 4.1.11' # this is needed for paypal 2.0.0
 gem 'paypal', '2.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index d91a3cb..ef575d1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,9 +40,6 @@ GEM
     data_magic (1.1)
       faker (>= 1.1.2)
       yml_reader (>= 0.6)
-    dbd-pg (0.3.9)
-      dbi (>= 0.4.0)
-      pg
     deprecated (2.0.1)
     diff-lcs (1.3)
     docile (1.1.5)
@@ -105,7 +102,7 @@ GEM
       mini_portile2 (~> 2.3.0)
     nori (2.6.0)
     ntlm-http (0.1.1)
-    odba (1.1.2)
+    odba (1.1.4)
       ydbd-pg (>= 0.5.1)
       ydbi (>= 0.5.1)
     oddb2tdat (1.1.2)
@@ -135,7 +132,7 @@ GEM
     rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (12.0.0)
+    rake (12.3.0)
     rake-compiler (0.9.9)
       rake
     rclconf (1.0.0)
@@ -216,10 +213,10 @@ GEM
       crack (>= 0.3.2)
       hashdiff
     webrobots (0.1.1)
-    ydbd-pg (0.5.3)
+    ydbd-pg (0.5.4)
       pg
-      ydbi (>= 0.5.0)
-    ydbi (0.5.3)
+      ydbi (= 0.5.4)
+    ydbi (0.5.4)
       deprecated (= 2.0.1)
     ydiffy (0.0.2)
     ydim (1.0.5)
@@ -250,7 +247,6 @@ DEPENDENCIES
   builder
   chromedriver-helper
   clogger
-  dbd-pg (= 0.3.9)
   dbi!
   deprecated (= 2.0.1)
   diff-lcs
@@ -277,7 +273,7 @@ DEPENDENCIES
   net-http-digest_auth
   net-http-persistent
   nokogiri
-  odba (>= 1.1.2)
+  odba (>= 1.1.4)
   oddb2tdat (= 1.1.2)
   ox (= 2.8.2)
   page-object
@@ -311,6 +307,7 @@ DEPENDENCIES
   watir-webdriver
   webmock
   webrobots (= 0.1.1)
+  ydbd-pg (= 0.5.4)
   ydiffy
   ydim
   ydocx (= 1.2.5)
diff --git a/etc/index_definitions.yaml b/etc/index_definitions.yaml
index 5897d39..168cadc 100644
--- a/etc/index_definitions.yaml
+++ b/etc/index_definitions.yaml
@@ -173,7 +173,6 @@ target_klass: 'ODDB::Doctor'
 resolve_search_term: 'search_text'
 resolve_target: ''
 resolve_origin: ''
-dictionary: 'simple'
 init_source: '@doctors.values'
 fulltext: true
 --- !ruby/object:ODBA::IndexDefinition 
@@ -222,7 +221,7 @@ target_klass: 'ODDB::Hospital'
 resolve_search_term: 'search_text'
 resolve_target: ''
 resolve_origin: ''
-dictionary: 'simple'
+dictionary: 'german'
 init_source: '@hospitals.values'
 fulltext: true
 --- !ruby/object:ODBA::IndexDefinition 
-- 
2.10.2