From 52e8aff146c162986566d3e03852395729d7c24d Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Wed, 30 Sep 2009 23:23:46 -0400 Subject: [PATCH] Move extensions directories to core_extensions --- lib/arel/algebra.rb | 2 +- lib/arel/algebra/core_extensions.rb | 4 ++++ lib/arel/algebra/{extensions => core_extensions}/class.rb | 0 lib/arel/algebra/{extensions => core_extensions}/hash.rb | 0 lib/arel/algebra/{extensions => core_extensions}/object.rb | 0 lib/arel/algebra/{extensions => core_extensions}/symbol.rb | 0 lib/arel/algebra/extensions.rb | 4 ---- lib/arel/engines/sql.rb | 2 +- lib/arel/engines/sql/core_extensions.rb | 4 ++++ lib/arel/engines/sql/{extensions => core_extensions}/array.rb | 0 .../engines/sql/{extensions => core_extensions}/nil_class.rb | 0 .../engines/sql/{extensions => core_extensions}/object.rb | 0 lib/arel/engines/sql/{extensions => core_extensions}/range.rb | 0 lib/arel/engines/sql/extensions.rb | 4 ---- 14 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 lib/arel/algebra/core_extensions.rb rename lib/arel/algebra/{extensions => core_extensions}/class.rb (100%) rename lib/arel/algebra/{extensions => core_extensions}/hash.rb (100%) rename lib/arel/algebra/{extensions => core_extensions}/object.rb (100%) rename lib/arel/algebra/{extensions => core_extensions}/symbol.rb (100%) delete mode 100644 lib/arel/algebra/extensions.rb create mode 100644 lib/arel/engines/sql/core_extensions.rb rename lib/arel/engines/sql/{extensions => core_extensions}/array.rb (100%) rename lib/arel/engines/sql/{extensions => core_extensions}/nil_class.rb (100%) rename lib/arel/engines/sql/{extensions => core_extensions}/object.rb (100%) rename lib/arel/engines/sql/{extensions => core_extensions}/range.rb (100%) delete mode 100644 lib/arel/engines/sql/extensions.rb diff --git a/lib/arel/algebra.rb b/lib/arel/algebra.rb index c206fea0b0..319f8fc242 100644 --- a/lib/arel/algebra.rb +++ b/lib/arel/algebra.rb @@ -1,4 +1,4 @@ -require 'arel/algebra/extensions' +require 'arel/algebra/core_extensions' require 'arel/algebra/predicates' require 'arel/algebra/relations' require 'arel/algebra/primitives' diff --git a/lib/arel/algebra/core_extensions.rb b/lib/arel/algebra/core_extensions.rb new file mode 100644 index 0000000000..bce86d04ba --- /dev/null +++ b/lib/arel/algebra/core_extensions.rb @@ -0,0 +1,4 @@ +require 'arel/algebra/core_extensions/object' +require 'arel/algebra/core_extensions/class' +require 'arel/algebra/core_extensions/symbol' +require 'arel/algebra/core_extensions/hash' diff --git a/lib/arel/algebra/extensions/class.rb b/lib/arel/algebra/core_extensions/class.rb similarity index 100% rename from lib/arel/algebra/extensions/class.rb rename to lib/arel/algebra/core_extensions/class.rb diff --git a/lib/arel/algebra/extensions/hash.rb b/lib/arel/algebra/core_extensions/hash.rb similarity index 100% rename from lib/arel/algebra/extensions/hash.rb rename to lib/arel/algebra/core_extensions/hash.rb diff --git a/lib/arel/algebra/extensions/object.rb b/lib/arel/algebra/core_extensions/object.rb similarity index 100% rename from lib/arel/algebra/extensions/object.rb rename to lib/arel/algebra/core_extensions/object.rb diff --git a/lib/arel/algebra/extensions/symbol.rb b/lib/arel/algebra/core_extensions/symbol.rb similarity index 100% rename from lib/arel/algebra/extensions/symbol.rb rename to lib/arel/algebra/core_extensions/symbol.rb diff --git a/lib/arel/algebra/extensions.rb b/lib/arel/algebra/extensions.rb deleted file mode 100644 index bc8edd3274..0000000000 --- a/lib/arel/algebra/extensions.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'arel/algebra/extensions/object' -require 'arel/algebra/extensions/class' -require 'arel/algebra/extensions/symbol' -require 'arel/algebra/extensions/hash' diff --git a/lib/arel/engines/sql.rb b/lib/arel/engines/sql.rb index f31cfc7dac..dc40428b77 100644 --- a/lib/arel/engines/sql.rb +++ b/lib/arel/engines/sql.rb @@ -3,5 +3,5 @@ require 'arel/engines/sql/relations' require 'arel/engines/sql/primitives' require 'arel/engines/sql/predicates' require 'arel/engines/sql/formatters' -require 'arel/engines/sql/extensions' +require 'arel/engines/sql/core_extensions' require 'arel/engines/sql/christener' diff --git a/lib/arel/engines/sql/core_extensions.rb b/lib/arel/engines/sql/core_extensions.rb new file mode 100644 index 0000000000..c8d9ec239e --- /dev/null +++ b/lib/arel/engines/sql/core_extensions.rb @@ -0,0 +1,4 @@ +require 'arel/engines/sql/core_extensions/object' +require 'arel/engines/sql/core_extensions/array' +require 'arel/engines/sql/core_extensions/range' +require 'arel/engines/sql/core_extensions/nil_class' diff --git a/lib/arel/engines/sql/extensions/array.rb b/lib/arel/engines/sql/core_extensions/array.rb similarity index 100% rename from lib/arel/engines/sql/extensions/array.rb rename to lib/arel/engines/sql/core_extensions/array.rb diff --git a/lib/arel/engines/sql/extensions/nil_class.rb b/lib/arel/engines/sql/core_extensions/nil_class.rb similarity index 100% rename from lib/arel/engines/sql/extensions/nil_class.rb rename to lib/arel/engines/sql/core_extensions/nil_class.rb diff --git a/lib/arel/engines/sql/extensions/object.rb b/lib/arel/engines/sql/core_extensions/object.rb similarity index 100% rename from lib/arel/engines/sql/extensions/object.rb rename to lib/arel/engines/sql/core_extensions/object.rb diff --git a/lib/arel/engines/sql/extensions/range.rb b/lib/arel/engines/sql/core_extensions/range.rb similarity index 100% rename from lib/arel/engines/sql/extensions/range.rb rename to lib/arel/engines/sql/core_extensions/range.rb diff --git a/lib/arel/engines/sql/extensions.rb b/lib/arel/engines/sql/extensions.rb deleted file mode 100644 index 1ea31bc140..0000000000 --- a/lib/arel/engines/sql/extensions.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'arel/engines/sql/extensions/object' -require 'arel/engines/sql/extensions/array' -require 'arel/engines/sql/extensions/range' -require 'arel/engines/sql/extensions/nil_class'