dm-sqlserver-adapter 1.0.2 → 1.1.0.rc1

data/Gemfile

@@ -1,90 +1,57 @@
-# If you're working on more than one datamapper gem at a time, then it's
-# recommended to create a local Gemfile and use this instead of the git
-# sources. This will make sure that you are  developing against your
-# other local datamapper sources that you currently work on. Gemfile.local
-# will behave identically to the standard Gemfile apart from the fact that
-# it fetches the gems from local paths. This means that you can use the
-# same environment variables, like ADAPTER when running bundle commands.
-# Gemfile.local is added to .gitignore, so you don't need to worry about
-# accidentally checking local development paths into git.
-#
-#   bundle exec rake local_gemfile
-#
-# will give you a Gemfile.local file that points to your local clones of
-# the various datamapper gems. It's assumed that all datamapper repo clones
-# reside in the same directory. You can use the Gemfile.local like so for
-# running any bundle command:
-#
-#   BUNDLE_GEMFILE=Gemfile.local bundle foo
-#
-# To speed up running bundle tasks, it's recommended to run
-#
-#   bundle lock
-#
-# after running 'bundle install' for the first time. This will make 'bundle exec' run
-# a lot faster compared to the unlocked version. With an unlocked bundle you would
-# typically just run 'bundle install' from time to time to fetch the latest sources from
-# upstream. When you locked your bundle, you need to run
-#
-#   bundle install --relock
-#
-# to make sure to fetch the latest updates and then lock the bundle again. Gemfile.lock
-# is added to the .gitignore file, so you don't need to worry about accidentally checking
-# it into version control.
+require 'pathname'
 
 source 'http://rubygems.org'
 
-DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.2'
-DO_VERSION = '~> 0.10.2'
+SOURCE       = ENV.fetch('SOURCE', :git).to_sym
+REPO_POSTFIX = SOURCE == :path ? ''                                : '.git'
+DATAMAPPER   = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
+DM_VERSION   = '~> 1.1.0.rc1'
+DO_VERSION   = '~> 0.10.2'
 
-group :runtime do # Runtime dependencies (as in the gemspec)
+do_options = {}
+do_options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
 
-  gem 'do_sqlserver',    DO_VERSION, do_options.dup
-  gem 'dm-do-adapter',   DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+group :runtime do
+
+  gem 'do_sqlserver',  DO_VERSION, do_options.dup
+  gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
 
 end
 
-group(:development) do # Development dependencies (as in the gemspec)
+group :development do
+
+  gem 'dm-migrations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-migrations#{REPO_POSTFIX}"
+  gem 'jeweler',       '~> 1.5.2'
+  gem 'rake',          '~> 0.8.7'
+  gem 'rspec',         '~> 1.3.1'
 
-  gem 'dm-migrations',   DM_VERSION, :git => "#{DATAMAPPER}/dm-migrations.git"
+end
 
-  gem 'rake',            '~> 0.8.7'
-  gem 'rspec',           '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
-  gem 'jeweler',         '~> 1.4'
+group :quality do
+
+  gem 'rcov',      '~> 0.9.9', :platforms => :mri_18
+  gem 'yard',      '~> 0.6'
+  gem 'yardstick', '~> 0.2'
 
 end
 
-group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+group :datamapper do
 
   if ENV['EXTLIB']
-    gem 'extlib',        '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git", :require => nil
+    gem 'extlib', '~> 0.9.15', SOURCE => "#{DATAMAPPER}/extlib#{REPO_POSTFIX}", :require => nil
   else
-    gem 'activesupport', '~> 3.0.0',  :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
+    gem 'activesupport', '~> 3.0.4', :require => nil
+    gem 'i18n',          '~> 0.5.0'
   end
 
-  do_options = {}
-  do_options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
-
-  gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+  gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
   gem 'data_objects',    DO_VERSION, do_options.dup
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
   plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
 
   plugins.each do |plugin|
-    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+    gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
   end
 
 end
-
-group :quality do # These gems contain rake tasks that check the quality of the source code
-
-  gem 'metric_fu',       '~> 1.3'
-  gem 'rcov',            '~> 0.9.7'
-  gem 'reek',            '~> 1.2.7'
-  gem 'roodi',           '~> 2.1'
-  gem 'yard',            '~> 0.5'
-  gem 'yardstick',       '~> 0.1'
-
-end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Dan Kubb
+Copyright (c) 2011 Dan Kubb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.4'
+  gem 'jeweler', '~> 1.5.2'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -15,16 +15,11 @@ begin
     gem.has_rdoc    = 'yard'
 
     gem.rubyforge_project = 'datamapper'
-
-    gem.add_dependency 'do_sqlserver',  '~> 0.10.2'
-    gem.add_dependency 'dm-do-adapter', '~> 1.0.2'
-
-    gem.add_development_dependency 'rspec', '~> 1.3'
   end
 
   Jeweler::GemcutterTasks.new
 
   FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.5.2'
 end

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0.rc1

data/dm-sqlserver-adapter.gemspec

@@ -1,68 +1,72 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-sqlserver-adapter}
-  s.version = "1.0.2"
+  s.version = "1.1.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Clifford Heath"]
-  s.date = %q{2010-09-07}
+  s.date = %q{2011-02-28}
   s.description = %q{Microsoft SQL Server Adapter for DataMapper}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "Rakefile",
-     "VERSION",
-     "dm-sqlserver-adapter.gemspec",
-     "lib/dm-sqlserver-adapter.rb",
-     "lib/dm-sqlserver-adapter/adapter.rb",
-     "lib/dm-sqlserver-adapter/spec/setup.rb",
-     "spec/adapter_spec.rb",
-     "spec/rcov.opts",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "tasks/local_gemfile.rake",
-     "tasks/spec.rake",
-     "tasks/yard.rake",
-     "tasks/yardstick.rake"
+    "Gemfile",
+    "LICENSE",
+    "Rakefile",
+    "VERSION",
+    "dm-sqlserver-adapter.gemspec",
+    "lib/dm-sqlserver-adapter.rb",
+    "lib/dm-sqlserver-adapter/adapter.rb",
+    "lib/dm-sqlserver-adapter/spec/setup.rb",
+    "spec/adapter_spec.rb",
+    "spec/rcov.opts",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "tasks/spec.rake",
+    "tasks/yard.rake",
+    "tasks/yardstick.rake"
   ]
-  s.has_rdoc = %q{yard}
   s.homepage = %q{http://github.com/datamapper/dm-sqlserver-adapter}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Microsoft SQL Server Adapter for DataMapper}
   s.test_files = [
     "spec/adapter_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<do_sqlserver>, ["~> 0.10.2"])
-      s.add_runtime_dependency(%q<dm-do-adapter>, ["~> 1.0.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_runtime_dependency(%q<dm-do-adapter>, ["~> 1.1.0.rc1"])
+      s.add_development_dependency(%q<dm-migrations>, ["~> 1.1.0.rc1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
       s.add_dependency(%q<do_sqlserver>, ["~> 0.10.2"])
-      s.add_dependency(%q<dm-do-adapter>, ["~> 1.0.2"])
-      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<dm-do-adapter>, ["~> 1.1.0.rc1"])
+      s.add_dependency(%q<dm-migrations>, ["~> 1.1.0.rc1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
     s.add_dependency(%q<do_sqlserver>, ["~> 0.10.2"])
-    s.add_dependency(%q<dm-do-adapter>, ["~> 1.0.2"])
-    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<dm-do-adapter>, ["~> 1.1.0.rc1"])
+    s.add_dependency(%q<dm-migrations>, ["~> 1.1.0.rc1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
   end
 end
 

data/lib/dm-sqlserver-adapter/adapter.rb

@@ -47,9 +47,15 @@ module DataMapper
           from_statement    = " FROM #{quote_name(query.model.storage_name(name))}"
           where_statement   = " WHERE #{conditions_statement}" unless conditions_statement.blank?
           join_statement    = join_statement(query, bind_values, qualify)
-          order_statement   = order_statement(order_by, qualify)
-          no_group_by       = group_by ? group_by.empty? : true
-          no_order_by       = order_by ? order_by.empty? : true
+          use_group_by      = group_by && group_by.any?
+          use_order_by      = order_by && order_by.any?
+
+          if use_order_by
+            order_statement = order_statement(order_by, qualify)
+          elsif use_limit_offset_subquery
+            order_by = query.model.key.map { |property| DataMapper::Query::Direction.new(property) }
+            order_statement = order_statement(order_by, qualify)
+          end
 
           if use_limit_offset_subquery
             # If using qualifiers, we must qualify elements outside the subquery
@@ -57,22 +63,22 @@ module DataMapper
             # Otherwise, we hit upon "multi-part identifier cannot be bound"
             # error from SQL Server.
             statement = "SELECT #{columns_statement(fields, 'RowResults')}"
-            statement << " FROM ( SELECT Row_Number() OVER (ORDER BY #{order_statement}) AS RowID,"
+            statement << " FROM (SELECT ROW_NUMBER() OVER (ORDER BY #{order_statement}) AS RowId,"
             statement << " #{columns_statement}"
             statement << from_statement
             statement << join_statement                                      if qualify
             statement << where_statement                                     if where_statement
             statement << ") AS RowResults"
             statement << " WHERE RowId > #{offset} AND RowId <= #{offset + limit}"
-            statement << " GROUP BY #{columns_statement(group_by, 'RowResults')}" unless no_group_by
-            statement << " ORDER BY #{order_statement(order_by, 'RowResults')}"   unless no_order_by
+            statement << " GROUP BY #{columns_statement(group_by, 'RowResults')}" if use_group_by
+            statement << " ORDER BY #{order_statement(order_by, 'RowResults')}"   if use_order_by
           else
             statement = "SELECT #{columns_statement}"
             statement << from_statement
             statement << join_statement                                      if qualify
             statement << where_statement                                     if where_statement
-            statement << " GROUP BY #{columns_statement(group_by, qualify)}" unless no_group_by
-            statement << " ORDER BY #{order_statement}"   unless no_order_by
+            statement << " GROUP BY #{columns_statement(group_by, qualify)}" if use_group_by
+            statement << " ORDER BY #{order_statement}"                      if use_order_by
           end
 
           add_limit_offset!(statement, limit, offset, bind_values) unless use_limit_offset_subquery

data/lib/dm-sqlserver-adapter/spec/setup.rb

@@ -7,7 +7,15 @@ module DataMapper
 
       class SqlserverAdapter < Adapter
         def connection_uri
-          "#{super};instance=SQLEXPRESS"
+          if instance_name.size > 0
+            "#{super};instance=#{instance_name}"
+          else
+            super
+          end
+        end
+
+        def instance_name
+          ENV.fetch('DM_DB_SQLSERVER_INSTANCE', 'SQLEXPRESS')
         end
       end
 

data/tasks/spec.rake

@@ -35,7 +35,4 @@ rescue LoadError
   end
 end
 
-task :spec => :check_dependencies
-task :rcov => :check_dependencies
-
 task :default => :spec

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 6
+  version: 1.1.0.rc1
 platform: ruby
 authors: 
 - Clifford Heath
@@ -14,53 +10,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -07:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: do_sqlserver
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 2
         version: 0.10.2
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-do-adapter
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+        version: 1.1.0.rc1
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: dm-migrations
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+        version: 1.1.0.rc1
   type: :development
+  prerelease: false
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *id006
 description: Microsoft SQL Server Adapter for DataMapper
 email: dan.kubb@gmail.com
 executables: []
@@ -70,7 +88,6 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 files: 
-- .gitignore
 - Gemfile
 - LICENSE
 - Rakefile
@@ -83,17 +100,16 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/local_gemfile.rake
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: yard
+has_rdoc: true
 homepage: http://github.com/datamapper/dm-sqlserver-adapter
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -101,21 +117,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Microsoft SQL Server Adapter for DataMapper

data/.gitignore

@@ -1,37 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## Rubinius
-*.rbc
-
-## PROJECT::GENERAL
-*.gem
-coverage
-rdoc
-pkg
-tmp
-doc
-log
-.yardoc
-measurements
-
-## BUNDLER
-.bundle
-Gemfile.local
-Gemfile.lock
-Gemfile.local.lock
-
-## PROJECT::SPECIFIC
-spec/db/

data/tasks/local_gemfile.rake

@@ -1,16 +0,0 @@
-desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
-task :local_gemfile do |t|
-
-  root       = Pathname(__FILE__).dirname.parent
-  datamapper = root.parent
-
-  root.join('Gemfile.local').open('w') do |f|
-    root.join('Gemfile').open.each do |line|
-      line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
-      line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  ':path => "#{DATAMAPPER}/\1"')
-      line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  'do_options[:path] = "#{DATAMAPPER}/\1"')
-      f.puts line
-    end
-  end
-
-end