Added postgresql support.

Gemfile

@@ -54,6 +54,7 @@ gem 'therubyracer'
 
 # e. g. for mysql you need to load mysql
 gem 'mysql2', '~> 0.3.20'
+gem 'pg'
 
 gem 'net-ldap'
 

Gemfile.lock

@@ -194,6 +194,7 @@ GEM
       omniauth-oauth (~> 1.1)
     parser (2.3.0.1)
       ast (~> 2.2)
+    pg (0.18.4)
     pluginator (1.3.0)
     polyglot (0.3.5)
     power_assert (0.2.7)
@@ -355,6 +356,7 @@ DEPENDENCIES
   omniauth-google-oauth2
   omniauth-linkedin
   omniauth-twitter
+  pg
   pre-commit
   puma
   rack-livereload

app/models/application_model.rb

@@ -303,11 +303,12 @@ returns
 
 =begin
 
-lookup model from cache (if exists) or retrieve it from db, id, name or login possible
+lookup model from cache (if exists) or retrieve it from db, id, name, login or email possible
 
   result = Model.lookup(id: 123)
   result = Model.lookup(name: 'some name')
   result = Model.lookup(login: 'some login')
+  result = Model.lookup(email: 'some login')
 
 returns
 
@@ -328,7 +329,11 @@ returns
       return cache if cache
 
       # do lookup with == to handle case insensitive databases
-      records = where(name: data[:name])
+      records = if Rails.application.config.db_case_sensitive
+                  where('LOWER(name) = LOWER(?)', data[:name])
+                else
+                  where(name: data[:name])
+                end
       records.each {|loop_record|
         if loop_record.name == data[:name]
           cache_set(data[:name], loop_record)
@@ -341,7 +346,11 @@ returns
       return cache if cache
 
       # do lookup with == to handle case insensitive databases
-      records = where(login: data[:login])
+      records = if Rails.application.config.db_case_sensitive
+                  where('LOWER(login) = LOWER(?)',  data[:login])
+                else
+                  where(login: data[:login])
+                end
       records.each {|loop_record|
         if loop_record.login == data[:login]
           cache_set(data[:login], loop_record)
@@ -349,9 +358,26 @@ returns
         end
       }
       return
+    elsif data[:email]
+      cache = cache_get(data[:email])
+      return cache if cache
+
+      # do lookup with == to handle case insensitive databases
+      records = if Rails.application.config.db_case_sensitive
+                  where('LOWER(email) = LOWER(?)',  data[:email])
+                else
+                  where(email: data[:email])
+                end
+      records.each {|loop_record|
+        if loop_record.email == data[:email]
+          cache_set(data[:email], loop_record)
+          return loop_record
+        end
+      }
+      return
     end
 
-    fail 'Need name, id or login for lookup()'
+    fail 'Need name, id, login or email for lookup()'
   end
 
 =begin
@@ -373,28 +399,44 @@ returns
     elsif data[:name]
 
       # do lookup with == to handle case insensitive databases
-      records = where(name: data[:name])
+      records = if Rails.application.config.db_case_sensitive
+                  where('LOWER(name) = LOWER(?)', data[:name])
+                else
+                  where(name: data[:name])
+                end
       records.each {|loop_record|
         return loop_record if loop_record.name == data[:name]
       }
     elsif data[:login]
 
       # do lookup with == to handle case insensitive databases
-      records = where(login: data[:login])
+      records = if Rails.application.config.db_case_sensitive
+                  where('LOWER(login) = LOWER(?)', data[:login])
+                else
+                  where(login: data[:login])
+                end
       records.each {|loop_record|
         return loop_record if loop_record.login == data[:login]
       }
     elsif data[:email]
 
       # do lookup with == to handle case insensitive databases
-      records = where(email: data[:email])
+      records = if Rails.application.config.db_case_sensitive
+                  where('LOWER(email) = LOWER(?)', data[:email])
+                else
+                  where(email: data[:email])
+                end
       records.each {|loop_record|
         return loop_record if loop_record.email == data[:email]
       }
     elsif data[:locale] && data[:source]
 
       # do lookup with == to handle case insensitive databases
-      records = where(locale: data[:locale], source: data[:source])
+      records = if Rails.application.config.db_case_sensitive
+                  where('LOWER(locale) = LOWER(?) AND LOWER(source) = LOWER(?)', data[:locale], data[:source])
+                else
+                  where(locale: data[:locale], source: data[:source])
+                end
       records.each {|loop_record|
         return loop_record if loop_record.source == data[:source]
       }
@@ -427,7 +469,11 @@ returns
     elsif data[:name]
 
       # do lookup with == to handle case insensitive databases
-      records = where(name: data[:name])
+      records = if Rails.application.config.db_case_sensitive
+                  where('LOWER(name) = LOWER(?)', data[:name])
+                else
+                  where(name: data[:name])
+                end
       records.each {|loop_record|
         if loop_record.name == data[:name]
           loop_record.update_attributes(data)
@@ -440,7 +486,11 @@ returns
     elsif data[:login]
 
       # do lookup with == to handle case insensitive databases
-      records = where(login: data[:login])
+      records = if Rails.application.config.db_case_sensitive
+                  where('LOWER(login) = LOWER(?)', data[:login])
+                else
+                  where(login: data[:login])
+                end
       records.each {|loop_record|
         if loop_record.login.casecmp(data[:login]).zero?
           loop_record.update_attributes(data)
@@ -453,7 +503,11 @@ returns
     elsif data[:email]
 
       # do lookup with == to handle case insensitive databases
-      records = where(email: data[:email])
+      records = if Rails.application.config.db_case_sensitive
+                  where('LOWER(email) = LOWER(?)',  data[:email])
+                else
+                  where(email: data[:email])
+                end
       records.each {|loop_record|
         if loop_record.email.casecmp(data[:email]).zero?
           loop_record.update_attributes(data)
@@ -466,7 +520,11 @@ returns
     elsif data[:locale]
 
       # do lookup with == to handle case insensitive databases
-      records = where(locale: data[:locale])
+      records = if Rails.application.config.db_case_sensitive
+                  where('LOWER(locale) = LOWER(?)', data[:locale])
+                else
+                  where(locale: data[:locale])
+                end
       records.each {|loop_record|
         if loop_record.locale.casecmp(data[:locale]).zero?
           loop_record.update_attributes(data)

app/models/ticket.rb

@@ -346,6 +346,7 @@ condition example
     # remember query and bind params
     query = ''
     bind_params = []
+    like = Rails.application.config.db_like
 
     # get tables to join
     tables = ''
@@ -437,11 +438,11 @@ condition example
           bind_params.push selector['value']
         end
       elsif selector['operator'] == 'contains'
-        query += "#{attribute} LIKE (?)"
+        query += "#{attribute} #{like} (?)"
         value = "%#{selector['value']}%"
         bind_params.push value
       elsif selector['operator'] == 'contains not'
-        query += "#{attribute} NOT LIKE (?)"
+        query += "#{attribute} NOT #{like} (?)"
         value = "%#{selector['value']}%"
         bind_params.push value
       elsif selector['operator'] == 'before (absolute)'

config/initializers/db_preferences.rb

@@ -0,0 +1,17 @@
+# set database preferences
+
+# defaults
+Rails.application.config.db_case_sensitive = false
+Rails.application.config.db_like = 'LIKE'
+Rails.application.config.db_4bytes_utf8 = true
+
+# postgresql
+if ActiveRecord::Base.connection_config[:adapter] == 'postgresql'
+  Rails.application.config.db_case_sensitive = true
+  Rails.application.config.db_like = 'ILIKE'
+end
+
+# mysql
+if ActiveRecord::Base.connection_config[:adapter] == 'mysql2'
+  Rails.application.config.db_4bytes_utf8 = false
+end

db/seeds.rb

@@ -3352,6 +3352,13 @@ Scheduler.create_or_update(
   created_by_id: 1,
 )
 
+# reset primary key sequences
+if ActiveRecord::Base.connection_config[:adapter] == 'postgresql'
+  ActiveRecord::Base.connection.tables.each do |t|
+    ActiveRecord::Base.connection.reset_pk_sequence!(t)
+  end
+end
+
 # install locales and translations
 Locale.create_if_not_exists(
   locale: 'en-us',

lib/core_ext/active_record/connection_adapters/postgresql/schema_statements.rb

@@ -0,0 +1,31 @@
+require 'active_record/connection_adapters/postgresql/schema_statements'
+
+module ActiveRecord
+  module ConnectionAdapters
+    module PostgreSQL
+      module SchemaStatements
+
+        # on postgres create lower indexes to support case insensetive wherer conditions
+        def add_index(table_name, column_name, options = {}) #:nodoc:
+          index_name, index_type, index_columns, index_options, index_algorithm, index_using = add_index_options(table_name, column_name, options)
+
+          column_names = index_columns.split ', '
+          if column_names.class == Array
+            index_columns_new = []
+            column_names.each {|i|
+              if i =~ /^"(name|login|locale|alias)"$/ || i =~ /name"$/
+                index_columns_new.push "LOWER(#{i})"
+              else
+                index_columns_new.push i
+              end
+            }
+            index_columns = index_columns_new.join ', '
+          end
+
+          execute "CREATE #{index_type} INDEX #{index_algorithm} #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} #{index_using} (#{index_columns})#{index_options}"
+
+        end
+      end
+    end
+  end
+end

lib/core_ext/string.rb

@@ -57,7 +57,7 @@ class String
   # unfortunaly UTF8mb4 will raise other limitaions of max varchar and lower index sizes
   # More details: http://pjambet.github.io/blog/emojis-and-mysql/
   def utf8_to_3bytesutf8
-    return self if ActiveRecord::Base.connection_config[:adapter] != 'mysql2'
+    return self if Rails.application.config.db_4bytes_utf8
     each_char.select {|c|
       if c.bytes.count > 3
         Rails.logger.warn "strip out 4 bytes utf8 chars '#{c}' of '#{self}'"

test/fixtures/seeds.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 # inital data set as extention to db/seeds.rb
+
+# create email address and apply it to all groups
 email_address = EmailAddress.create_if_not_exists(
-  id: 1,
   realname: 'Zammad',
   email: 'zammad@localhost',
   updated_by_id: 1,

test/unit/activity_stream_test.rb

@@ -16,7 +16,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
     updated_by_id: 1,
     created_by_id: 1
   )
-  current_user = User.lookup( login: 'nicole.braun@zammad.org' )
+  current_user = User.lookup(email: 'nicole.braun@zammad.org')
 
   test 'ticket+user' do
     tests = [
@@ -138,7 +138,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
       ticket_id = ticket.id
       ticket.destroy
       found = Ticket.where(id: ticket_id).first
-      assert( !found, 'Ticket destroyed')
+      assert_not(found, 'Ticket destroyed')
     }
   end
 
@@ -279,7 +279,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
       user_id = user.id
       user.destroy
       found = User.where( id: user_id ).first
-      assert( !found, 'User destroyed')
+      assert_not(found, 'User destroyed')
     }
   end
 

test/unit/auth_test.rb

@@ -32,15 +32,16 @@ Setting.create_or_update(
   frontend: false
 )
 
-user = User.lookup( login: 'nicole.braun@zammad.org' )
+user = User.lookup(email: 'nicole.braun@zammad.org')
 if user
   user.update_attributes(
+    login: 'nicole.braun',
     password: 'some_pass',
     active: true,
   )
 else
   User.create_if_not_exists(
-    login: 'nicole.braun@zammad.org',
+    login: 'nicole.braun',
     firstname: 'Nicole',
     lastname: 'Braun',
     email: 'nicole.braun@zammad.org',
@@ -63,6 +64,42 @@ class AuthTest < ActiveSupport::TestCase
       },
 
       # test 2
+      {
+        username: 'nicole.braun@zammad.org',
+        password: 'some_pass',
+        result: true,
+        verify: {
+          firstname: 'Nicole',
+          lastname: 'Braun',
+          email: 'nicole.braun@zammad.org',
+        }
+      },
+
+      # test 3
+      {
+        username: 'nicole.bRaUn@zammad.org',
+        password: 'some_pass',
+        result: true,
+        verify: {
+          firstname: 'Nicole',
+          lastname: 'Braun',
+          email: 'nicole.braun@zammad.org',
+        }
+      },
+
+      # test 4
+      {
+        username: 'nicole.bRaUn',
+        password: 'some_pass',
+        result: true,
+        verify: {
+          firstname: 'Nicole',
+          lastname: 'Braun',
+          email: 'nicole.braun@zammad.org',
+        }
+      },
+
+      # test 5
       {
         username: 'paige.chen@example.org',
         password: 'password',
@@ -74,17 +111,6 @@ class AuthTest < ActiveSupport::TestCase
         }
       },
 
-      # test 3
-      {
-        username: 'nicole.braun@zammad.org',
-        password: 'some_pass',
-        result: true,
-        verify: {
-          firstname: 'Nicole',
-          lastname: 'Braun',
-          email: 'nicole.braun@zammad.org',
-        }
-      },
     ]
     tests.each { |test|
       user = User.authenticate(test[:username], test[:password])

test/unit/history_test.rb

@@ -2,7 +2,7 @@
 require 'test_helper'
 
 class HistoryTest < ActiveSupport::TestCase
-  current_user = User.lookup( login: 'nicole.braun@zammad.org' )
+  current_user = User.lookup(email: 'nicole.braun@zammad.org')
 
   test 'ticket' do
     tests = [
@@ -189,7 +189,7 @@ class HistoryTest < ActiveSupport::TestCase
       ticket_id = ticket.id
       ticket.destroy
       found = Ticket.where(id: ticket_id).first
-      assert( !found, 'Ticket destroyed')
+      assert_not(found, 'Ticket destroyed')
     }
   end
 
@@ -281,7 +281,7 @@ class HistoryTest < ActiveSupport::TestCase
       user_id = user.id
       user.destroy
       found = User.where(id: user_id).first
-      assert( !found, 'User destroyed')
+      assert_not(found, 'User destroyed')
     }
   end
 
@@ -350,7 +350,7 @@ class HistoryTest < ActiveSupport::TestCase
       organization_id = organization.id
       organization.destroy
       found = Organization.where(id: organization_id).first
-      assert( !found, 'Organization destroyed')
+      assert_not(found, 'Organization destroyed')
     }
   end
 
@@ -387,7 +387,7 @@ class HistoryTest < ActiveSupport::TestCase
       if check_item[:result]
         assert(match, "history check not matched! #{check_item.inspect}")
       else
-        assert( !match, "history check matched but should not! #{check_item.inspect}")
+        assert_not(match, "history check matched but should not! #{check_item.inspect}")
       end
     }
   end

test/unit/online_notifiaction_test.rb

@@ -28,7 +28,7 @@ class OnlineNotificationTest < ActiveSupport::TestCase
     updated_by_id: 1,
     created_by_id: 1
   )
-  customer_user = User.lookup( login: 'nicole.braun@zammad.org' )
+  customer_user = User.lookup(email: 'nicole.braun@zammad.org')
 
   test 'ticket notification' do
     tests = [