diff options
author | Andrew White <pixeltrix@users.noreply.github.com> | 2016-11-12 17:43:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-12 17:43:23 +0000 |
commit | 78a4aa8d1af8e0857ce2634231a2be2528d797aa (patch) | |
tree | e7233bb8ed6a72d07d270d4b0ba84bf71d4ce6d2 /activerecord | |
parent | 26dd9b26ab7317f94fd285245879e888344143b2 (diff) | |
parent | 9e214b4010bacd53fd2b6bb5bcf56899e76b8da8 (diff) | |
download | rails-78a4aa8d1af8e0857ce2634231a2be2528d797aa.tar.gz rails-78a4aa8d1af8e0857ce2634231a2be2528d797aa.tar.bz2 rails-78a4aa8d1af8e0857ce2634231a2be2528d797aa.zip |
Merge pull request #27022 from kamipo/add_nodoc_to_table_structure
Add `:nodoc` to `table_structure`
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index 6b215a7374..0493ab4e4b 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -304,14 +304,6 @@ module ActiveRecord select_values(sql, "SCHEMA").any? end - # Returns an array of +Column+ objects for the table specified by +table_name+. - def columns(table_name) # :nodoc: - table_name = table_name.to_s - table_structure(table_name).map do |field| - new_column_from_field(table_name, field) - end - end - def new_column_from_field(table_name, field) # :nondoc: case field["dflt_value"] when /^null$/i @@ -434,11 +426,12 @@ module ActiveRecord protected - def table_structure(table_name) + def table_structure(table_name) # :nodoc: structure = exec_query("PRAGMA table_info(#{quote_table_name(table_name)})", "SCHEMA") raise(ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'") if structure.empty? table_structure_with_collation(table_name, structure) end + alias column_definitions table_structure def alter_table(table_name, options = {}) #:nodoc: altered_table_name = "a#{table_name}" |