activerecord-rdb-adapter 0.9.4 → 0.9.6.beta2

data/lib/active_record/connection_adapters/rdb/quoting.rb

@@ -1,152 +1,152 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module Rdb
-      module Quoting # :nodoc:
-        QUOTED_FALSE = "'false'".freeze
-        QUOTED_TRUE = "'true'".freeze
-
-        QUOTED_POSITION = '"POSITION"'.freeze
-        QUOTED_VALUE = '"VALUE"'.freeze
-
-        def quote_string(string) # :nodoc:
-          string.gsub(/'/, "''")
-        end
-
-        def quoted_date(time)
-          if time.is_a?(Time) || time.is_a?(DateTime)
-            time.localtime.strftime('%d.%m.%Y %H:%M:%S')
-          else
-            time.strftime('%d.%m.%Y')
-          end
-        end
-
-        def quote_column_name(column_name) # :nodoc:
-          column = column_name.dup.to_s
-          column.gsub!(/(?<=[^"\w]|^)position(?=[^"\w]|$)/i, QUOTED_POSITION)
-          column.gsub!(/(?<=[^"\w]|^)value(?=[^"\w]|$)/i, QUOTED_VALUE)
-          column.delete!('"')
-          column.upcase!
-          @connection.dialect == 1 ? column.to_s : %("#{column}")
-        end
-
-        def quote_table_name_for_assignment(_table, attr)
-          quote_column_name(attr)
-        end
-
-        def unquoted_true
-          true
-        end
-
-        def quoted_true # :nodoc:
-          QUOTED_TRUE
-        end
-
-        def unquoted_false
-          false
-        end
-
-        def quoted_false # :nodoc:
-          QUOTED_FALSE
-        end
-
-        def type_cast_from_column(column, value) # :nodoc:
-          if column
-            type = column.type || lookup_cast_type_from_column(column)
-            if type.is_a?(ActiveRecord::Type::Serialized)
-              value
-            else
-              type.serialize(value)
-            end
-          else
-            value
-          end
-        end
-
-        def lookup_cast_type_from_column(column) # :nodoc:
-          type = column.try(:sql_type) || column.try(:type)
-          lookup_cast_type(type)
-        end
-
-        def type_casted_binds(binds) # :nodoc:
-          if binds.first.is_a?(Array)
-            binds.map { |column, value| type_cast(value, column) }
-          else
-            binds.map { |attr| type_cast(attr.value_for_database, attr) }
-          end
-        end
-
-        private
-
-        def id_value_for_database(value)
-          primary_key = value.class.primary_key
-          if primary_key
-            value.instance_variable_get(:@attributes)[primary_key].value_for_database
-          end
-        end
-
-        def _quote(value)
-          case value
-          when Time, DateTime
-            "'#{value.strftime('%d.%m.%Y %H:%M')}'"
-          when Date
-            "'#{value.strftime('%d.%m.%Y')}'"
-          else
-            super
-          end
-        end
-
-        def _type_cast(value)
-          case value
-          when Symbol, ActiveSupport::Multibyte::Chars, Type::Binary::Data
-            value.to_s
-          when Array
-            value.to_yaml
-          when Hash then
-            encode_hash(value)
-          when true then
-            unquoted_true
-          when false then
-            unquoted_false
-            # BigDecimals need to be put in a non-normalized form and quoted.
-          when BigDecimal then
-            value.to_s('F')
-          when Type::Time::Value then
-            quoted_time(value)
-          when Date, Time, DateTime then
-            quoted_date(value)
-          when *types_which_need_no_typecasting
-            value
-          else
-            raise TypeError
-          end
-        end
-
-        def rdb_to_ar_case(column_name)
-          /[[:lower:]]/.match?(column_name) ? column_name : column_name.downcase
-        end
-
-        def ar_to_rdb_case(column_name)
-          /[[:upper:]]/.match?(column_name) ? column_name : column_name.upcase
-        end
-
-        def encode_hash(value)
-          if value.is_a?(Hash)
-            value.to_yaml
-          else
-            value
-          end
-        end
-
-        if defined? Encoding
-          def decode(str)
-            Base64.decode64(str).force_encoding(@connection.encoding)
-          end
-        else
-          def decode(str)
-            Base64.decode64(str)
-          end
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  module ConnectionAdapters
+    module Rdb
+      module Quoting # :nodoc:
+        QUOTED_FALSE = "'false'".freeze
+        QUOTED_TRUE = "'true'".freeze
+
+        QUOTED_POSITION = '"POSITION"'.freeze
+        QUOTED_VALUE = '"VALUE"'.freeze
+
+        def quote_string(string) # :nodoc:
+          string.gsub(/'/, "''")
+        end
+
+        def quoted_date(time)
+          if time.is_a?(Time) || time.is_a?(DateTime)
+            time.localtime.strftime('%d.%m.%Y %H:%M:%S')
+          else
+            time.strftime('%d.%m.%Y')
+          end
+        end
+
+        def quote_column_name(column_name) # :nodoc:
+          column = column_name.dup.to_s
+          column.gsub!(/(?<=[^"\w]|^)position(?=[^"\w]|$)/i, QUOTED_POSITION)
+          column.gsub!(/(?<=[^"\w]|^)value(?=[^"\w]|$)/i, QUOTED_VALUE)
+          column.delete!('"')
+          column.upcase!
+          @connection.dialect == 1 ? column.to_s : %("#{column}")
+        end
+
+        def quote_table_name_for_assignment(_table, attr)
+          quote_column_name(attr)
+        end
+
+        def unquoted_true
+          true
+        end
+
+        def quoted_true # :nodoc:
+          QUOTED_TRUE
+        end
+
+        def unquoted_false
+          false
+        end
+
+        def quoted_false # :nodoc:
+          QUOTED_FALSE
+        end
+
+        def type_cast_from_column(column, value) # :nodoc:
+          if column
+            type = column.type || lookup_cast_type_from_column(column)
+            if type.is_a?(ActiveRecord::Type::Serialized)
+              value
+            else
+              type.serialize(value)
+            end
+          else
+            value
+          end
+        end
+
+        def lookup_cast_type_from_column(column) # :nodoc:
+          type = column.try(:sql_type) || column.try(:type)
+          lookup_cast_type(type)
+        end
+
+        def type_casted_binds(binds) # :nodoc:
+          if binds.first.is_a?(Array)
+            binds.map { |column, value| type_cast(value, column) }
+          else
+            binds.map { |attr| type_cast(attr.value_for_database, attr) }
+          end
+        end
+
+        private
+
+        def id_value_for_database(value)
+          primary_key = value.class.primary_key
+          if primary_key
+            value.instance_variable_get(:@attributes)[primary_key].value_for_database
+          end
+        end
+
+        def _quote(value)
+          case value
+          when Time, DateTime
+            "'#{value.strftime('%d.%m.%Y %H:%M:%S')}'"
+          when Date
+            "'#{value.strftime('%d.%m.%Y')}'"
+          else
+            super
+          end
+        end
+
+        def _type_cast(value)
+          case value
+          when Symbol, ActiveSupport::Multibyte::Chars, Type::Binary::Data
+            value.to_s
+          when Array
+            value.to_yaml
+          when Hash then
+            encode_hash(value)
+          when true then
+            unquoted_true
+          when false then
+            unquoted_false
+            # BigDecimals need to be put in a non-normalized form and quoted.
+          when BigDecimal then
+            value.to_s('F')
+          when Type::Time::Value then
+            quoted_time(value)
+          when Date, Time, DateTime then
+            quoted_date(value)
+          when *types_which_need_no_typecasting
+            value
+          else
+            raise TypeError
+          end
+        end
+
+        def rdb_to_ar_case(column_name)
+          /[[:lower:]]/.match?(column_name) ? column_name : column_name.downcase
+        end
+
+        def ar_to_rdb_case(column_name)
+          /[[:upper:]]/.match?(column_name) ? column_name : column_name.upcase
+        end
+
+        def encode_hash(value)
+          if value.is_a?(Hash)
+            value.to_yaml
+          else
+            value
+          end
+        end
+
+        if defined? Encoding
+          def decode(str)
+            Base64.decode64(str).force_encoding(@connection.encoding)
+          end
+        else
+          def decode(str)
+            Base64.decode64(str)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/rdb/schema_creation.rb

@@ -1,53 +1,53 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module Rdb
-      class SchemaCreation < AbstractAdapter::SchemaCreation # :nodoc:
-
-        private
-
-        def visit_ColumnDefinition(o)
-          o.sql_type = type_to_sql(o.type, o.options)
-          column_sql = "#{quote_column_name(o.name)} #{o.sql_type}"
-          add_column_options!(column_sql, column_options(o)) unless o.type == :primary_key
-          column_sql
-        end
-
-        def add_column_options!(sql, options)
-          sql << " DEFAULT #{quote_default_expression(options[:default], options[:column])}" if options_include_default?(options)
-          # must explicitly check for :null to allow change_column to work on migrations
-          if !options[:null].nil? && !options[:null]
-            sql << " NOT NULL"
-          end
-          if options[:auto_increment]
-            sql << " AUTO_INCREMENT"
-          end
-          if options[:primary_key]
-            sql << " PRIMARY KEY"
-          end
-          sql
-        end
-
-        def visit_TableDefinition(o)
-          create_sql = "CREATE#{' TEMPORARY' if o.temporary} TABLE #{quote_table_name(o.name)} "
-
-          statements = o.columns.map(&method(:accept))
-          statements << accept(o.primary_keys) if o.primary_keys
-
-          if supports_indexes_in_create?
-            statements.concat(o.indexes.map { |column_name, options| index_in_create(o.name, column_name, options) })
-          end
-
-          if supports_foreign_keys_in_create?
-            statements.concat(o.foreign_keys.map { |to_table, options| foreign_key_in_create(o.name, to_table, options) })
-          end
-
-          create_sql << "(#{statements.join(', ')})" if statements.present?
-          add_table_options!(create_sql, table_options(o))
-          create_sql << " AS #{@conn.to_sql(o.as)}" if o.as
-          create_sql
-        end
-
-      end
-    end
-  end
+module ActiveRecord
+  module ConnectionAdapters
+    module Rdb
+      class SchemaCreation < AbstractAdapter::SchemaCreation # :nodoc:
+
+        private
+
+        def visit_ColumnDefinition(o)
+          o.sql_type = type_to_sql(o.type, o.options)
+          column_sql = "#{quote_column_name(o.name)} #{o.sql_type}"
+          add_column_options!(column_sql, column_options(o)) unless o.type == :primary_key
+          column_sql
+        end
+
+        def add_column_options!(sql, options)
+          sql << " DEFAULT #{quote_default_expression(options[:default], options[:column])}" if options_include_default?(options)
+          # must explicitly check for :null to allow change_column to work on migrations
+          if !options[:null].nil? && !options[:null]
+            sql << " NOT NULL"
+          end
+          if options[:auto_increment]
+            sql << " AUTO_INCREMENT"
+          end
+          if options[:primary_key]
+            sql << " PRIMARY KEY"
+          end
+          sql
+        end
+
+        def visit_TableDefinition(o)
+          create_sql = "CREATE#{' TEMPORARY' if o.temporary} TABLE #{quote_table_name(o.name)} "
+
+          statements = o.columns.map(&method(:accept))
+          statements << accept(o.primary_keys) if o.primary_keys
+
+          if supports_indexes_in_create?
+            statements.concat(o.indexes.map { |column_name, options| index_in_create(o.name, column_name, options) })
+          end
+
+          if supports_foreign_keys_in_create?
+            statements.concat(o.foreign_keys.map { |to_table, options| foreign_key_in_create(o.name, to_table, options) })
+          end
+
+          create_sql << "(#{statements.join(', ')})" if statements.present?
+          add_table_options!(create_sql, table_options(o))
+          create_sql << " AS #{@conn.to_sql(o.as)}" if o.as
+          create_sql
+        end
+
+      end
+    end
+  end
 end

data/lib/active_record/connection_adapters/rdb/schema_dumper.rb

@@ -1,23 +1,23 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module Rdb
-      class SchemaDumper < ConnectionAdapters::SchemaDumper # :nodoc:
-        private
-
-        def column_spec_for_primary_key(column)
-          spec = super
-          spec.delete(:auto_increment) if column.type == :integer && column.auto_increment?
-          spec
-        end
-
-        def schema_type(column)
-          if column.bigint?
-            :bigint
-          else
-            column.type.type
-          end
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  module ConnectionAdapters
+    module Rdb
+      class SchemaDumper < ConnectionAdapters::SchemaDumper # :nodoc:
+        private
+
+        def column_spec_for_primary_key(column)
+          spec = super
+          spec.delete(:auto_increment) if column.type == :integer && column.auto_increment?
+          spec
+        end
+
+        def schema_type(column)
+          if column.bigint?
+            :bigint
+          else
+            column.type.type
+          end
+        end
+      end
+    end
+  end
+end