More cleanup.

Author: metaskills

lib/active_record/connection_adapters/sqlserver/schema_creation.rb

@@ -23,34 +23,6 @@ def add_column_options!(sql, options)
           end
         end
 
-        def visit_TableDefinition(o)
-          quoted_name = "#{quote_table_name((o.temporary ? '#' : '') + o.name.to_s)} "
-
-          if o.as
-            if o.as.is_a?(ActiveRecord::Relation)
-              select = o.as.to_sql
-            elsif o.as.is_a?(String)
-              select = o.as
-            else
-              raise 'Only able to generate a table from a SELECT statement passed as a String or ActiveRecord::Relation'
-            end
-
-            create_sql = 'SELECT * INTO '
-            create_sql << quoted_name
-            create_sql << 'FROM ('
-            create_sql << select
-            create_sql << ') AS __sq'
-
-          else
-            create_sql = "CREATE TABLE "
-            create_sql << quoted_name
-            create_sql << "(#{o.columns.map { |c| accept c }.join(', ')}) "
-            create_sql << "#{o.options}"
-          end
-
-          create_sql
-        end
-
       end
     end
   end

test/cases/specific_schema_test_sqlserver.rb

@@ -9,6 +9,12 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
     SSTestDollarTableName.limit(20).offset(1)
   end
 
+  it 'models can use tinyint pk tables' do
+    obj = SSTestTinyintPk.create! name: '1'
+    obj.id.is_a? Fixnum
+    SSTestTinyintPk.find(obj.id).must_equal obj
+  end
+
   it 'be able to complex count tables with no primary key' do
     SSTestNoPkData.delete_all
     10.times { |n| SSTestNoPkData.create! name: "Test#{n}" }

test/models/sql_server_order_row_number.rb

@@ -0,0 +1,3 @@
+class SSTestTinyintPk < ActiveRecord::Base
+  self.table_name = 'sst_tinyint_pk'
+end

test/models/sql_server_string.rb

@@ -75,8 +75,6 @@
     t.column 'crazy]]quote', :string
     t.column 'with spaces', :string
   end
-  execute %|ALTER TABLE [sst_edge_schemas] ADD [guid_newid] uniqueidentifier DEFAULT NEWID();|
-  execute %|ALTER TABLE [sst_edge_schemas] ADD [guid_newseqid] uniqueidentifier DEFAULT NEWSEQUENTIALID();|
 
   execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_natural_pk_data') DROP TABLE sst_natural_pk_data"
   execute <<-NATURALPKTABLESQL
@@ -98,6 +96,14 @@
     )
   NATURALPKINTTABLESQL
 
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_tinyint_pk') DROP TABLE sst_tinyint_pk"
+  execute <<-TINYITPKTABLE
+    CREATE TABLE sst_tinyint_pk(
+      id tinyint IDENTITY NOT NULL PRIMARY KEY,
+      name nvarchar(255)
+    )
+  TINYITPKTABLE
+
   # Constraints
 
   create_table(:sst_has_fks, force: true) { |t| t.column(:fk_id, :integer, null: false) }
@@ -141,33 +147,6 @@
 
 
 
-  # http://blogs.msdn.com/b/craigfr/archive/2008/03/19/ranking-functions-row-number.aspx
-  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'order_row_number') DROP TABLE order_row_number"
-  execute <<-ORDERROWNUMBERSQL
-    CREATE TABLE [order_row_number] (id int IDENTITY, a int, b int, c int)
-    CREATE UNIQUE CLUSTERED INDEX [idx_order_row_number_id] ON [order_row_number] ([id])
-    INSERT [order_row_number] VALUES (0, 1, 8)
-    INSERT [order_row_number] VALUES (0, 3, 6)
-    INSERT [order_row_number] VALUES (0, 5, 4)
-    INSERT [order_row_number] VALUES (0, 7, 2)
-    INSERT [order_row_number] VALUES (0, 9, 0)
-    INSERT [order_row_number] VALUES (1, 0, 9)
-    INSERT [order_row_number] VALUES (1, 2, 7)
-    INSERT [order_row_number] VALUES (1, 4, 5)
-    INSERT [order_row_number] VALUES (1, 6, 3)
-    INSERT [order_row_number] VALUES (1, 8, 1)
-  ORDERROWNUMBERSQL
-
-  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'tinyint_pk_table') DROP TABLE tinyint_pk_table"
-  execute <<-TINYITPKTABLE
-    CREATE TABLE tinyint_pk_table(
-      id tinyint NOT NULL PRIMARY KEY,
-      name nvarchar(255)
-    )
-  TINYITPKTABLE
-
-
-