TimezoneParser 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25ef86372b8861bf6e4971ca261cf3f3c4d820e63d59c242a6a9f253910ac2c2
-  data.tar.gz: 0a858e6277137ac2cdb158dfbf82318bf0446d4818438dea1fa1702e18c48e29
+  metadata.gz: 3142c5391513b96c7862dc7220c1ccd85e4288366a361935054113cc22629594
+  data.tar.gz: 5435d8f578bebcdb8ac8cba258b0a295e6c1b9bb6e0f3c1cdd2c32146150b70f
 SHA512:
-  metadata.gz: 36277f05b9a6334c8b838bc333422b570e3984b034cf2d0d44493123ac21e30ee5836142e951028ddb26e530af1178585f361aa756ed26735d2d4d50048a58d5
-  data.tar.gz: 6489d950773033d0d4c1ece559051c3e8e593a0a26fde08708255d63726819b7f2ca184adeedc5f24c5af293495450d9532e11ac796d8d5190d530cd116ec9a1
+  metadata.gz: ea39d10652896a5a4c21dca7943f6fc03493206e5286ba06b1ca993112557cf0aa2851470681f45468f676d4740659d5f5ab69cbe9ed40a58f1d276c0d7afce4
+  data.tar.gz: afab3a15077508cc496337d72af6d4d9f9bcf8c86decefa64ba2cd571ba081315b46d318a93ccaa00f4c905c317a5fb77bb10a625a186ae0d3ca1de633e57533

data/.gitignore

@@ -16,4 +16,4 @@ test/tmp
 test/version_tmp
 vendor/
 tmp
-/data/*.dat
+/data/*.db

data/README.md

@@ -102,7 +102,6 @@ code coverage will also be generated
 ## Code status
 [![Gem Version](https://badge.fury.io/rb/TimezoneParser.png)](http://badge.fury.io/rb/TimezoneParser)
 [![Build Status](https://travis-ci.org/davispuh/TimezoneParser.png?branch=master)](https://travis-ci.org/davispuh/TimezoneParser)
-[![Dependency Status](https://gemnasium.com/davispuh/TimezoneParser.png)](https://gemnasium.com/davispuh/TimezoneParser)
 [![Coverage Status](https://coveralls.io/repos/davispuh/TimezoneParser/badge.png?branch=master)](https://coveralls.io/r/davispuh/TimezoneParser?branch=master)
 [![Code Climate](https://codeclimate.com/github/davispuh/TimezoneParser.png)](https://codeclimate.com/github/davispuh/TimezoneParser)
 

data/Rakefile

@@ -5,6 +5,7 @@ require 'yard'
 require 'yaml'
 require 'pathname'
 require 'timezone_parser/data'
+require 'timezone_parser/data/exporter'
 
 desc 'Default: run specs.'
 task :default => :spec
@@ -206,10 +207,7 @@ end
 
 desc 'Export data'
 task 'export' do
-    ['abbreviations.yaml', 'timezones.yaml', 'countries.yaml', 'metazones.yaml',
-        'windows_zonenames.yaml', 'windows_timezones.yaml', 'windows_offsets.yaml',
-        'rails.yaml', 'rails_i18n.yaml'].each do |name|
-        path = data_location + name
-        Marshal.dump(YAML.load_file(path), File.open(path.dirname + (path.basename('.*').to_s + '.dat'), 'wb'))
-    end
+    exporter = TimezoneParser::Data::Exporter.new(data_location)
+    exporter.exportDatabase
 end
+

data/TimezoneParser.gemspec

@@ -16,11 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($/)
   spec.files.delete_if { |name| name[-4, 4] == '.yaml' }
   spec.files         << 'data/version.yaml'
-  ['abbreviations.dat', 'countries.dat', 'metazones.dat',
-  'rails.dat', 'rails_i18n.dat', 'timezones.dat',
-  'windows_offsets.dat', 'windows_timezones.dat', 'windows_zonenames.dat'].each do |name|
-    spec.files       << 'data/' + name
-  end
+  spec.files         << 'data/timezones.db'
 
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
@@ -28,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'tzinfo'
   spec.add_runtime_dependency 'insensitive_hash'
+  spec.add_runtime_dependency 'sqlite3'
 
   spec.add_development_dependency 'bundler', '>= 1.3'
   spec.add_development_dependency 'rake'

data/data/schema.sql

@@ -0,0 +1,164 @@
+
+CREATE TABLE Timezones (`ID` INTEGER PRIMARY KEY,
+                        `Name` TEXT NOT NULL COLLATE NOCASE);
+CREATE UNIQUE INDEX IDX_Timezones ON Timezones (`Name`);
+
+
+CREATE TABLE Territories (`ID` INTEGER PRIMARY KEY,
+                      `Territory` TEXT NOT NULL COLLATE NOCASE);
+CREATE UNIQUE INDEX IDX_Territories ON Territories (`Territory`);
+
+
+CREATE TABLE TerritoryContainment (`ID` INTEGER PRIMARY KEY,
+                                   `Parent` INTEGER NOT NULL,
+                                   `Territory` INTEGER NOT NULL,
+                                    FOREIGN KEY(`Parent`) REFERENCES Territories(`ID`),
+                                    FOREIGN KEY(`Territory`) REFERENCES Territories(`ID`));
+CREATE UNIQUE INDEX IDX_TerritoryContainment ON TerritoryContainment (`Parent`, `Territory`);
+
+
+CREATE TABLE TimezoneTerritories (`ID` INTEGER PRIMARY KEY,
+                              `Timezone` INTEGER NOT NULL,
+                              `Territory` INTEGER NOT NULL,
+                              FOREIGN KEY(`Territory`) REFERENCES Territories(`ID`));
+CREATE UNIQUE INDEX IDX_TimezoneTerritories ON TimezoneTerritories (`Timezone`, `Territory`);
+
+
+CREATE TABLE Locales (`ID` INTEGER PRIMARY KEY,
+                      `Name` TEXT NOT NULL COLLATE NOCASE,
+                      `Parent` INTEGER);
+CREATE UNIQUE INDEX IDX_Locales ON Locales (`Name`);
+
+
+CREATE TABLE TimezoneNames (`ID` INTEGER PRIMARY KEY,
+                            `Locale` INTEGER NOT NULL,
+                            `Name` TEXT NOT NULL COLLATE BINARY,
+                            `NameLowercase` TEXT NOT NULL COLLATE NOCASE,
+                            `Types` INTEGER,
+                            FOREIGN KEY(`Locale`) REFERENCES Locales(`ID`));
+CREATE UNIQUE INDEX IDX_TimezoneNames ON TimezoneNames (`Locale`, `Name`);
+CREATE INDEX IDX_TimezoneNamesLowercase ON TimezoneNames (`NameLowercase`);
+
+
+CREATE TABLE Metazones (`ID` INTEGER PRIMARY KEY,
+                        `Name` TEXT NOT NULL COLLATE NOCASE);
+CREATE UNIQUE INDEX IDX_Metazones ON Metazones (`Name`);
+
+
+CREATE TABLE MetazonePeriods (`ID` INTEGER PRIMARY KEY,
+                              `Metazone` INTEGER NOT NULL,
+                              `From` TEXT,
+                              `To` TEXT,
+                               FOREIGN KEY(`Metazone`) REFERENCES Metazones(`ID`));
+CREATE UNIQUE INDEX IDX_MetazonePeriods ON MetazonePeriods (`Metazone`, `From`, `To`);
+
+
+CREATE TABLE MetazonePeriod_Timezones (`ID` INTEGER PRIMARY KEY,
+                                       `MetazonePeriod` INTEGER NOT NULL,
+                                       `Timezone` INTEGER NOT NULL,
+                                       FOREIGN KEY(`MetazonePeriod`) REFERENCES MetazonePeriods(`ID`),
+                                       FOREIGN KEY(`Timezone`) REFERENCES Timezones(`ID`));
+CREATE UNIQUE INDEX IDX_MetazonePeriod_Timezones ON MetazonePeriod_Timezones (`MetazonePeriod`, `Timezone`);
+
+
+CREATE TABLE TimezoneName_Timezones (`ID` INTEGER PRIMARY KEY,
+                                     `Name` INTEGER NOT NULL,
+                                     `Timezone` INTEGER NOT NULL,
+                                     FOREIGN KEY(`Name`) REFERENCES TimezoneNames(`ID`),
+                                     FOREIGN KEY(`Timezone`) REFERENCES Timezones(`ID`));
+CREATE UNIQUE INDEX IDX_TimezoneName_Timezones ON TimezoneName_Timezones (`Name`, `Timezone`);
+
+
+CREATE TABLE TimezoneName_Metazones (`ID` INTEGER PRIMARY KEY,
+                                     `Name` INTEGER NOT NULL,
+                                     `Metazone` INTEGER NOT NULL,
+                                     FOREIGN KEY(`Name`) REFERENCES TimezoneNames(`ID`),
+                                     FOREIGN KEY(`Metazone`) REFERENCES Metazones(`ID`));
+CREATE UNIQUE INDEX IDX_TimezoneName_Metazones ON TimezoneName_Metazones (`Name`, `Metazone`);
+
+
+CREATE TABLE Abbreviations (`ID` INTEGER PRIMARY KEY,
+                            `Name` TEXT NOT NULL COLLATE BINARY,
+                            `NameLowercase` TEXT NOT NULL COLLATE NOCASE);
+CREATE UNIQUE INDEX IDX_Abbreviations ON Abbreviations (`Name`);
+CREATE UNIQUE INDEX IDX_AbbreviationsLowercase ON Abbreviations (`NameLowercase`);
+
+
+CREATE TABLE AbbreviationOffsets (`ID` INTEGER PRIMARY KEY,
+                                  `Abbreviation` INTEGER NOT NULL,
+                                  `Offset` INTEGER,
+                                  `Types` INTEGER,
+                                  `From` TEXT,
+                                  `To` TEXT,
+                                   FOREIGN KEY(`Abbreviation`) REFERENCES Abbreviations(`ID`));
+CREATE UNIQUE INDEX IDX_AbbreviationOffsets ON AbbreviationOffsets (`Abbreviation`, `Offset`, `From`, `To`);
+
+
+CREATE TABLE AbbreviationOffset_Timezones (`ID` INTEGER PRIMARY KEY,
+                                  `Offset` INTEGER NOT NULL,
+                                  `Timezone` INTEGER NOT NULL,
+                                   FOREIGN KEY(`Offset`) REFERENCES AbbreviationOffsets(`ID`),
+                                   FOREIGN KEY(`Timezone`) REFERENCES Timezones(`ID`));
+CREATE UNIQUE INDEX IDX_AbbreviationOffset_Timezones ON AbbreviationOffset_Timezones (`Offset`, `Timezone`);
+
+
+CREATE TABLE AbbreviationOffset_Metazones (`ID` INTEGER PRIMARY KEY,
+                                  `Offset` INTEGER NOT NULL,
+                                  `Metazone` INTEGER NOT NULL,
+                                   FOREIGN KEY(`Offset`) REFERENCES AbbreviationOffsets(`ID`),
+                                   FOREIGN KEY(`Metazone`) REFERENCES Metazones(`ID`));
+CREATE UNIQUE INDEX IDX_AbbreviationOffset_Metazones ON AbbreviationOffset_Metazones (`Offset`, `Metazone`);
+
+
+CREATE TABLE RailsTimezones (`ID` INTEGER PRIMARY KEY,
+                             `Name` TEXT NOT NULL COLLATE NOCASE,
+                             `Timezone` INTEGER NOT NULL,
+                             FOREIGN KEY(`Timezone`) REFERENCES Timezones(`ID`));
+CREATE UNIQUE INDEX IDX_RailsTimezones ON RailsTimezones (`Name`);
+
+
+CREATE TABLE RailsI18N (`ID` INTEGER PRIMARY KEY,
+                        `Locale` INTEGER NOT NULL,
+                        `Name` TEXT NOT NULL COLLATE BINARY,
+                        `NameLowercase` TEXT NOT NULL COLLATE NOCASE,
+                        `Zone` INTEGER NOT NULL,
+                        FOREIGN KEY(`Locale`) REFERENCES Locales(`ID`),
+                        FOREIGN KEY(`Zone`) REFERENCES RailsTimezones(`ID`));
+CREATE UNIQUE INDEX IDX_RailsI18N ON RailsI18N (`Locale`, `Name`);
+CREATE INDEX IDX_RailsI18NName ON RailsI18N (`NameLowercase`);
+
+
+CREATE TABLE WindowsZones (`ID` INTEGER PRIMARY KEY,
+                           `Name` TEXT NOT NULL COLLATE NOCASE,
+                           `Standard` INTEGER NOT NULL,
+                           `Daylight` INTEGER NOT NULL);
+CREATE UNIQUE INDEX IDX_WindowsZones ON WindowsZones (`Name`);
+
+
+CREATE TABLE WindowsZone_Timezones (`ID` INTEGER PRIMARY KEY,
+                                    `Zone` INTEGER NOT NULL,
+                                    `Territory` INTEGER NOT NULL,
+                                    `Timezone` INTEGER NOT NULL,
+                                    FOREIGN KEY(`Zone`) REFERENCES WindowsZones(`ID`),
+                                    FOREIGN KEY(`Territory`) REFERENCES Territories(`ID`),
+                                    FOREIGN KEY(`Timezone`) REFERENCES Timezones(`ID`));
+CREATE UNIQUE INDEX IDX_WindowsZone_Timezones ON WindowsZone_Timezones (`Zone`, `Territory`, `Timezone`);
+
+
+CREATE TABLE WindowsZoneNames (`ID` INTEGER PRIMARY KEY,
+                               `Locale` INTEGER NOT NULL,
+                               `Name` TEXT NOT NULL COLLATE BINARY,
+                               `NameLowercase` TEXT NOT NULL COLLATE NOCASE,
+                               `Types` INTEGER,
+                               FOREIGN KEY(`Locale`) REFERENCES Locales(`ID`));
+CREATE UNIQUE INDEX IDX_WindowsZoneNames ON WindowsZoneNames (`Locale`, `Name`);
+CREATE INDEX IDX_WindowsZoneNamesLowercase ON WindowsZoneNames (`NameLowercase`);
+
+
+CREATE TABLE WindowsZoneName_Zones (`ID` INTEGER PRIMARY KEY,
+                                    `Name` INTEGER NOT NULL,
+                                    `Zone` INTEGER NOT NULL,
+                                    FOREIGN KEY(`Name`) REFERENCES WindowsZoneNames(`ID`),
+                                    FOREIGN KEY(`Zone`) REFERENCES WindowsZones(`ID`));
+CREATE UNIQUE INDEX IDX_WindowsZoneName_Zones ON WindowsZoneName_Zones (`Name`, `Zone`);
+

data/lib/timezone_parser.rb

@@ -49,17 +49,6 @@ module TimezoneParser
         @@Locales
     end
 
-    # Load Timezone data in memory from files
-    #
-    # If no modules are specified it will load default modules
-    # @param modules [Array<Symbol>] list of modules
-    # @see Modules
-    # @see AllModules
-    def self.preload(modules = @@Modules)
-        modules = AllModules if modules.nil? or modules.empty?
-        Data::Storage.preload(modules)
-    end
-
     # Check if given Timezone name is a valid timezone
     # @param name [String] either Timezone name or abbreviation
     # @param locales [Array<String>] check only for these locales
@@ -112,13 +101,13 @@ module TimezoneParser
         offsets += Abbreviation::getOffsets(name, toTime, fromTime, regions, type) if modules.include?(:Abbreviations)
         return offsets.to_a if not all and not offsets.empty?
 
-        offsets += Timezone::getOffsets(name, toTime, fromTime, locales, regions, all) if modules.include?(:Timezones)
+        offsets += Timezone::getOffsets(name, toTime, fromTime, locales, regions) if modules.include?(:Timezones)
         return offsets.to_a if not all and not offsets.empty?
 
-        offsets += WindowsZone::getOffsets(name, locales, all) if modules.include?(:WindowsZones)
+        offsets += WindowsZone::getOffsets(name, locales) if modules.include?(:WindowsZones)
         return offsets.to_a if not all and not offsets.empty?
 
-        offsets += RailsZone::getOffsets(name, toTime, fromTime, locales, all) if modules.include?(:RailsZones)
+        offsets += RailsZone::getOffsets(name, toTime, fromTime, locales) if modules.include?(:RailsZones)
         offsets.to_a
     end
 
@@ -146,13 +135,13 @@ module TimezoneParser
         timezones += Abbreviation::getTimezones(name, toTime, fromTime, regions, type) if modules.include?(:Abbreviations)
         return timezones.to_a if not all and not timezones.empty?
 
-        timezones += Timezone::getTimezones(name, toTime, fromTime, locales, regions, all) if modules.include?(:Timezones)
+        timezones += Timezone::getTimezones(name, toTime, fromTime, locales, regions) if modules.include?(:Timezones)
         return timezones.to_a if not all and not timezones.empty?
 
-        timezones += WindowsZone::getTimezones(name, locales, regions, all) if modules.include?(:WindowsZones)
+        timezones += WindowsZone::getTimezones(name, locales, regions) if modules.include?(:WindowsZones)
         return timezones.to_a if not all and not timezones.empty?
 
-        timezones += RailsZone::getTimezones(name, locales, all) if modules.include?(:RailsZones)
+        timezones += RailsZone::getTimezones(name, locales) if modules.include?(:RailsZones)
         timezones.to_a
     end
 end

data/lib/timezone_parser/abbreviation.rb

@@ -23,7 +23,6 @@ module TimezoneParser
         # @param abbreviation [String] Timezone abbreviation
         def initialize(abbreviation)
             @Abbreviation = abbreviation
-            @Data = Data.new
             setTime
             set(@@Regions.dup, nil)
         end
@@ -42,59 +41,25 @@ module TimezoneParser
         # Check if abbreviation is valid
         # @return [Boolean] whether abbreviation is valid
         def isValid?
-            Data::Storage.Abbreviations.has_key?(@Abbreviation)
-        end
-
-        # Abbreviation data
-        # @return [Data] data
-        def getData
-            unless @Loaded
-                @Loaded = true
-                if isValid?
-                    data = Data::Storage.Abbreviations[@Abbreviation]
-                    if data.count == 1
-                        @Data.processEntry(data.first, @ToTime, @FromTime, @Regions)
-                        return @Data
-                    end
-                    entries = Data.filterData(data, @ToTime, @FromTime, @Type, @Regions)
-                    entries.each do |entry|
-                        @Data.processEntry(entry, @ToTime, @FromTime, @Regions)
-                    end
-                    return @Data
-                end
-            end
-            @Data
-        end
-
-        # Get UTC offsets in seconds
-        # @return [Array<Fixnum>] list of timezone offsets in seconds
-        def getOffsets
-            unless @Offsets
-                @Offsets = getData.Offsets.to_a
-                if @Offsets.empty? and not getTimezones.empty?
-                    types = nil
-                    types = [@Type] if @Type
-                    @Offsets = @Data.findOffsets(@ToTime, @FromTime, @Regions, types).to_a
-                end
+            if @Valid.nil?
+                sql = 'SELECT 1 FROM `Abbreviations` WHERE `Name` = ? LIMIT 1'
+                @Valid = Data::Storage.getStatement(sql).execute(@Abbreviation).count > 0
             end
-            @Offsets
+            @Valid
         end
 
         # Check if given Timezone abbreviation (case-sensitive) is a valid timezone
         # @param abbreviation [String] Timezone abbreviation
         # @return [Boolean] whether Timezone is valid
         def self.isValid?(abbreviation)
-            Data::Storage.Abbreviations.has_key?(abbreviation)
+            Data::Storage.getStatement('SELECT 1 FROM `Abbreviations` WHERE `Name` = ? LIMIT 1').execute(abbreviation).count > 0
         end
 
         # Check if given Timezone abbreviation (case-insensitive) could be a valid timezone
         # @param abbreviation [String] Timezone abbreviation to check for
         # @return [Boolean] whether Timezone is valid
         def self.couldBeValid?(abbreviation)
-            Data::Storage.Abbreviations.each_key do |abbr|
-              return true if abbr.casecmp(abbreviation).zero?
-            end
-            false
+            Data::Storage.getStatement('SELECT 1 FROM `Abbreviations` WHERE `NameLowercase` = ? LIMIT 1').execute(abbreviation.downcase).count > 0
         end
 
         # Get UTC offsets in seconds for given Timezone abbreviation
@@ -126,5 +91,111 @@ module TimezoneParser
         def self.getMetazones(abbreviation)
             self.new(abbreviation).getMetazones
         end
+
+        protected
+
+        def getFilteredData(dataType)
+            types = nil
+            types = [@Type] if @Type
+
+            params = [@Abbreviation.downcase]
+            column = nil
+            joins = ' INNER JOIN `AbbreviationOffsets` AS O ON O.Abbreviation = A.ID'
+            regionJoins = ''
+            useMetazonePeriodFilter = false
+            case dataType
+            when :Offsets, :Timezones
+                column = '`Timezones`.`Name`'
+                if dataType == :Offsets
+                    column = 'O.`Offset`, `Timezones`.`Name`, O.`Types`'
+                end
+                joins += ' LEFT JOIN `AbbreviationOffset_Timezones` AS T ON T.Offset = O.ID'
+                joins += ' LEFT JOIN `AbbreviationOffset_Metazones` AS M ON M.Offset = O.ID'
+                joins += ' LEFT JOIN `MetazonePeriods` MP ON M.Metazone = MP.Metazone'
+                joins += ' LEFT JOIN `MetazonePeriod_Timezones` MPT ON MPT.MetazonePeriod = MP.ID'
+                joins += ' LEFT JOIN `Timezones` ON (T.Timezone = Timezones.ID OR MPT.Timezone = Timezones.ID)'
+                regionJoins += ' LEFT JOIN `TimezoneTerritories` ON (TimezoneTerritories.Timezone = T.Timezone OR TimezoneTerritories.Timezone = MPT.Timezone)'
+                regionJoins += ' LEFT JOIN `Territories` ON TimezoneTerritories.Territory = Territories.ID'
+                useMetazonePeriodFilter = true
+            when :Metazones
+                column = '`Metazones`.`Name`'
+                joins += ' INNER JOIN `AbbreviationOffset_Metazones` AS M ON M.Offset = O.ID'
+                joins += ' INNER JOIN `Metazones` ON M.Metazone = Metazones.ID'
+                regionJoins += ' LEFT JOIN `AbbreviationOffset_Timezones` AS T ON T.Offset = O.ID'
+                regionJoins += ' LEFT JOIN `TimezoneTerritories` ON TimezoneTerritories.Timezone = T.Timezone'
+                regionJoins += ' LEFT JOIN `Territories` ON TimezoneTerritories.Territory = Territories.ID'
+            when :Types
+                 column = 'O.`Types`'
+            else
+                raise StandardError, "Unkown dataType '#{dataType}'"
+            end
+            sql = 'SELECT DISTINCT ' + column + ' FROM `Abbreviations` AS A'
+            sql += joins
+            if not @Regions.nil? and not @Regions.empty?
+                sql += regionJoins
+            end
+            sql += ' WHERE A.`NameLowercase` = ?'
+            if not types.nil?
+                if types.include?(:standard) and not types.include?(:daylight)
+                    sql += ' AND (O.`Types` & ?) > 0'
+                    params << TIMEZONE_TYPE_STANDARD
+
+                else
+                    sql += ' AND (O.`Types` & ?) > 0'
+                    params << TIMEZONE_TYPE_DAYLIGHT
+                end
+            end
+            unless @FromTime.nil?
+                fromsql = '((O.`From` IS NULL AND O.`To` > ?) OR (O.`To` IS NULL AND O.`From` <= ?) OR (O.`From` <= ? AND O.`To` > ?) OR (O.`From` IS NULL AND O.`To` IS NULL))'
+                params += Array.new(4, @FromTime.to_s)
+                if useMetazonePeriodFilter
+                    fromsql = '(' + fromsql + ' AND ((MP.`From` IS NULL AND MP.`To` > ?) OR (MP.`To` IS NULL AND MP.`From` <= ?) OR (MP.`From` <= ? AND MP.`To` > ?) OR (MP.`From` IS NULL AND MP.`To` IS NULL)))'
+                    params += Array.new(4, @FromTime.to_s)
+                end
+                if @ToTime.nil?
+                    sql += ' AND ' + fromsql
+                end
+            end
+            unless @ToTime.nil?
+                tosql = '((O.`From` IS NULL AND O.`To` >= ?) OR (O.`To` IS NULL AND O.`From` < ?) OR (O.`From` < ? AND O.`To` >= ?) OR (O.`From` IS NULL AND O.`To` IS NULL))'
+                params += Array.new(4, @ToTime.to_s)
+                if useMetazonePeriodFilter
+                    tosql = '(' + tosql + ' AND ((MP.`From` IS NULL AND MP.`To` >= ?) OR (MP.`To` IS NULL AND MP.`From` < ?) OR (MP.`From` < ? AND MP.`To` >= ?) OR (MP.`From` IS NULL AND MP.`To` IS NULL)))'
+                    params += Array.new(4, @ToTime.to_s)
+                end
+                if not @FromTime.nil?
+                    sql += ' AND ((' + fromsql + ') OR (' + tosql + '))'
+                else
+                    sql += ' AND ' + tosql
+                end
+            end
+            if not @Regions.nil? and not @Regions.empty?
+                sql += ' AND Territories.Territory IN (' + Array.new(@Regions.count, '?').join(',')  + ')'
+                params += @Regions
+            end
+            sql += ' ORDER BY ' + column
+            if dataType == :Offsets
+                result = Set.new
+                timezonesTypes = []
+                Data::Storage.getStatement(sql).execute(*params).each do |row|
+                    if row.first.nil?
+                        timezonesTypes << [row[1], row[2]]
+                    else
+                        result << row.first
+                    end
+                end
+
+                result += self.class.findOffsetsFromTimezonesTypes(timezonesTypes, @ToTime, @FromTime, types) if result.empty?
+
+                result = result.sort
+            else
+                result = Data::Storage.getStatement(sql).execute(*params).collect { |row| row.first }
+                if dataType == :Types
+                    result = self.class.convertTypes(result)
+                end
+            end
+            result
+        end
+
     end
 end