<%= check_box 'auth_source', 'onthefly_register' %>
++<%= check_box 'auth_source', 'enabled_passwd' %>
diff --git a/config/locales/de.yml b/config/locales/de.yml index 1337edd..d9a346f 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -150,13 +150,14 @@ de: general_pdf_encoding: ISO-8859-1 general_first_day_of_week: '1' + notice_external_password_error: Externes Konto konnte nicht aktualisiert werden. notice_account_updated: Konto wurde erfolgreich aktualisiert. notice_account_invalid_creditentials: Benutzer oder Kennwort ist ungültig. notice_account_password_updated: Kennwort wurde erfolgreich aktualisiert. notice_account_wrong_password: Falsches Kennwort. notice_account_register_done: Konto wurde erfolgreich angelegt. notice_account_unknown_email: Unbekannter Benutzer. - notice_can_t_change_password: Dieses Konto verwendet eine externe Authentifizierungs-Quelle. Unmöglich, das Kennwort zu ändern. + notice_can_t_change_password: Kennwort ändern ist gesperrt für diese externe Authentifizierungs-Quelle. notice_account_lost_email_sent: Eine E-Mail mit Anweisungen, ein neues Kennwort zu wählen, wurde Ihnen geschickt. notice_account_activated: Ihr Konto ist aktiviert. Sie können sich jetzt anmelden. notice_successful_create: Erfolgreich angelegt @@ -273,6 +274,8 @@ de: field_attr_lastname: Name-Attribut field_attr_mail: E-Mail-Attribut field_onthefly: On-the-fly-Benutzererstellung + field_password_encryption: Verschlüsselungsart + field_enabled_passwd: Password ändern erlauben field_start_date: Beginn field_done_ratio: % erledigt field_auth_source: Authentifizierungs-Modus diff --git a/config/locales/en.yml b/config/locales/en.yml index c3fc52e..816fe2f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -127,6 +127,7 @@ en: general_pdf_encoding: ISO-8859-1 general_first_day_of_week: '7' + notice_external_password_error: External password changing goes wrong notice_account_updated: Account was successfully updated. notice_account_invalid_creditentials: Invalid user or password notice_account_password_updated: Password was successfully updated. @@ -253,6 +254,8 @@ en: field_attr_lastname: Lastname attribute field_attr_mail: Email attribute field_onthefly: On-the-fly user creation + field_password_encryption: Encyrption + field_enabled_passwd: Enabled password changing field_start_date: Start field_done_ratio: % Done field_auth_source: Authentication mode diff --git a/db/migrate/20100609104539_ldap_password_change.rb b/db/migrate/20100609104539_ldap_password_change.rb new file mode 100644 index 0000000..60a87af --- /dev/null +++ b/db/migrate/20100609104539_ldap_password_change.rb @@ -0,0 +1,11 @@ +class LdapPasswordChange < ActiveRecord::Migration + def self.up + add_column :auth_sources, :password_encryption, :enum, :limit => [:MD5, :SSHA, :CLEAR], :default => :MD5 + add_column :auth_sources, :enabled_passwd, :boolean, :default => false + end + + def self.down + remove_column :auth_sources, :password_encryption + remove_column :auth_sources, :enabled_passwd + end +end diff --git a/vendor/plugins/enum-column/init.rb b/vendor/plugins/enum-column/init.rb new file mode 100644 index 0000000..28b2db4 --- /dev/null +++ b/vendor/plugins/enum-column/init.rb @@ -0,0 +1,9 @@ +require 'enum/enum_adapter' +require 'enum/mysql_adapter' if defined? ActiveRecord::ConnectionAdapters::MysqlAdapter +require 'enum/postgresql_adapter' if defined? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter +require 'enum/sqlite3_adapter' if defined? ActiveRecord::ConnectionAdapters::SQLite3Adapter +require 'enum/schema_statements' +require 'enum/schema_definitions' +require 'enum/quoting' +require 'enum/validations' +require 'enum/active_record_helper' diff --git a/vendor/plugins/enum-column/lib/enum/active_record_helper.rb b/vendor/plugins/enum-column/lib/enum/active_record_helper.rb new file mode 100644 index 0000000..297f4a4 --- /dev/null +++ b/vendor/plugins/enum-column/lib/enum/active_record_helper.rb @@ -0,0 +1,107 @@ + +module ActionView + module Helpers + module FormHelper + # helper to create a select drop down list for the enumerated values. This + # is the default input tag. + def enum_select(object_name, method, options = {}) + if RAILS_GEM_VERSION < '2.2.0' + tag = InstanceTag.new(object_name, method, self, nil, options.delete(:object)) + else + tag = InstanceTag.new(object_name, method, self, options.delete(:object)) + end + tag.to_enum_select_tag(options) + end + + # Creates a set of radio buttons for all the enumerated values. + def enum_radio(object_name, method, options = {}) + if RAILS_GEM_VERSION < '2.2.0' + tag = InstanceTag.new(object_name, method, self, nil, options.delete(:object)) + else + tag = InstanceTag.new(object_name, method, self, options.delete(:object)) + end + tag.to_enum_radio_tag(options) + end + end + + class FormBuilder + def enum_select(method, options = { }) + @template.enum_select(@object_name, method, options) + end + + def enum_radio(method, options = { }) + @template.enum_radio(@object_name, method, options) + end + end + + class InstanceTag #:nodoc: + alias __to_tag_enum to_tag + + # Add the enumeration tag support. Defaults using the select tag to + # display the options. + def to_tag(options = {}) + if column_type == :enum + to_enum_select_tag(options) + else + __to_tag_enum(options) + end + end + + # Create a select tag and one option for each of the + # enumeration values. + def to_enum_select_tag(options = {}) + # Remove when we no longer support 1.1. + begin + v = value(object) + rescue ArgumentError + v = value + end + add_default_name_and_id(options) + tag_text = "This plugin is an ROR extension to support enumerations in the database schema using the enum type in MySQL or column constraints in other databases. Currently only MySQL has been implemented, but other connection adapters can easily be extended to check for column constraints and then parse out the possible values.
+ +This makes it very easy to implement and maintain controlled vocabularies in the database schema without having to change the validations and the view. I have made an effort to make the modifications without modifying the core classes, but I have not been extreamly successful. I have had to make some modifications that are version dependent and then put some exception handlers to make the backward compatible.
+ +This is not the ideal solution and could cause some performance issues in the helpers. The core code still works with both 1.1 and 1.2 without modification.
+ +To install using the plugin script:
++ script/plugin install enum-column ++ +
To manually install using Subversion, do the following. In your vendor/plugins directory,
+ type the following:
+
+ svn checkout svn://rubyforge.org/var/svn/enum-column ++ +
Otherwize download the latest zip or tarball and unpack it in your vendor/plugins directory.
When you create your schema, specify the constraint as a limit:
++ create_table :enumerations, :force => true do |t| + t.column :severity, :enum, :limit => [:low, :medium, :high, :critical], + :default => :medium + t.column :color, :enum, :limit => [:red, :blue, :green, :yellow] + ... + end ++ +
You can then automatically validate this column using:
++ validates_columns :severity, :color ++ +
The rest will be handled for you. All enumerated values will be given as symbols.
++ @e = Enumeration.new + @e.severity = :low ++ +
In the controller:
++ @e = Enumeration.new ++ +
The enumerates list of values will be specified as follows:
++ <%= input 'e', 'severity' %> ++ +
Will create a select/option list:
++ <select id="e_severity" name="e[severity]"> + <option value="low">low</option> + <option value="medium" selected="selected">medium</option> + <option value="high">high</option> + <option value="critical">critical</option> + </select> ++ +
You can also create a set of radio buttons using the following helper:
+
+ <%= enum_radio('e', 'severity') %=>
+
+Will produce the following group of radio buttons:
++ <label>low: <input id="test_severity_low" name="test[severity]" type="radio" value="low" /></label> + <label>medium: <input checked="checked" id="test_severity_medium" name="test[severity]" type="radio" value="medium" /></label> + <label>high: <input id="test_severity_high" name="test[severity]" type="radio" value="high" /></label> + <label>critical: <input id="test_severity_critical" name="test[severity]" type="radio" value="critical" /></label> ++ +
You can always use the column reflection to get the list of possible values from the database column.
++ Enumeration.columns_hash['color'].values + + Will yield: [:red, :blue, :green, :yellow] ++ + diff --git a/vendor/plugins/enum-column/test/db/schema.rb b/vendor/plugins/enum-column/test/db/schema.rb new file mode 100644 index 0000000..96ba17c --- /dev/null +++ b/vendor/plugins/enum-column/test/db/schema.rb @@ -0,0 +1,28 @@ + +ActiveRecord::Schema.define do + create_table :enumerations, :force => true do |t| + t.column :severity, :enum, :limit => [:low, :medium, :high, :critical], + :default => :medium + t.column :color, :enum, :limit => [:red, :blue, :green, :yellow] + t.column :string_field, :string, :limit => 8, :null => false + t.column :int_field, :integer + end + + + create_table :basic_enums, :force => true do |t| + t.column :value, :enum, :limit => [:good, :working] + end + + create_table :basic_default_enums, :force => true do |t| + t.column :value, :enum, :limit => [:good, :working],:default => :working + end + + create_table :nonnull_enums, :force => true do |t| + t.column :value, :enum, :limit => [:good, :working],:null => false + end + + create_table :nonnull_default_enums, :force => true do |t| + t.column :value, :enum, :limit => [:good, :working],:null => false,:default => :working + end + +end diff --git a/vendor/plugins/enum-column/test/enum_mysql_test.rb b/vendor/plugins/enum-column/test/enum_mysql_test.rb new file mode 100644 index 0000000..99b9481 --- /dev/null +++ b/vendor/plugins/enum-column/test/enum_mysql_test.rb @@ -0,0 +1,220 @@ +require File.dirname(__FILE__) + '/test_helper' +require 'fixtures/enumeration' + +class EnumerationsTest < Test::Unit::TestCase + class EnumController < ActionController::Base + def test1 + @test = Enumeration.new + render :inline => "<%= input('test', 'severity')%>" + end + + def test2 + @test = Enumeration.new + render :inline => "<%= enum_radio('test', 'severity')%>" + end + end + + def setup + Enumeration.connection.execute 'DELETE FROM enumerations' + end + + def test_column_values + columns = Enumeration.columns_hash + color_column = columns['color'] + assert color_column + assert_equal [:red, :blue, :green, :yellow], color_column.values + + severity_column = columns['severity'] + assert severity_column + assert_equal [:low, :medium, :high, :critical], severity_column.values + assert_equal :medium, severity_column.default + end + + def test_insert_enum + row = Enumeration.new + row.color = :blue + row.string_field = 'test' + assert_equal :medium, row.severity + assert row.save + + db_row = Enumeration.find(row.id) + assert db_row + assert :blue, row.color + assert :medium, row.severity + end + + # Uses the automatic validates_columns to create automatic validation rules + # for columns based on the schema information. + def test_bad_value + row = Enumeration.new + row.color = :violet + row.string_field = 'test' + assert !row.save + + assert row.errors + assert_equal 'is not included in the list', row.errors['color'] + end + + def test_other_types + row = Enumeration.new + row.string_field = 'a' * 10 + assert !row.save + assert_equal 'is too long (maximum is 8 characters)', row.errors['string_field'] + + row = Enumeration.new + assert !row.save + assert_equal 'can\'t be blank', row.errors['string_field'] + + row = Enumeration.new + row.string_field = 'test' + row.int_field = 'aaaa' + assert !row.save + assert_equal 'is not a number', row.errors['int_field'] + + row = Enumeration.new + row.string_field = 'test' + row.int_field = '500' + assert row.save + end + + def test_view_helper + request = ActionController::TestRequest.new + response = ActionController::TestResponse.new + request.action = 'test1' + body = EnumController.process(request, response).body + assert_equal '', body + end + + def test_radio_helper + request = ActionController::TestRequest.new + response = ActionController::TestResponse.new + request.action = 'test2' + body = EnumController.process(request, response).body + assert_equal '', body + end + + + # Basic tests + def test_create_basic_default + assert (object = BasicEnum.create) + assert_nil object.value, + "Enum columns without explicit default, default to null if allowed" + assert !object.new_record? + end + + def test_create_basic_good + assert (object = BasicEnum.create(:value => :good)) + assert_equal :good, object.value + assert !object.new_record? + assert (object = BasicEnum.create(:value => :working)) + assert_equal :working, object.value + assert !object.new_record? + end + + def test_create_basic_null + assert (object = BasicEnum.create(:value => nil)) + assert_nil object.value + assert !object.new_record? + end + + def test_create_basic_bad + assert (object = BasicEnum.create(:value => :bad)) + assert object.new_record? + end + + # Basic w/ Default + + ###################################################################### + + def test_create_basic_wd_default + assert (object = BasicDefaultEnum.create) + assert_equal :working, object.value, "Explicit default ignored columns" + assert !object.new_record? + end + + def test_create_basic_wd_good + assert (object = BasicDefaultEnum.create(:value => :good)) + assert_equal :good, object.value + assert !object.new_record? + assert (object = BasicDefaultEnum.create(:value => :working)) + assert_equal :working, object.value + assert !object.new_record? + end + + def test_create_basic_wd_null + assert (object = BasicDefaultEnum.create(:value => nil)) + assert_nil object.value + assert !object.new_record? + end + + def test_create_basic_wd_bad + assert (object = BasicDefaultEnum.create(:value => :bad)) + assert object.new_record? + end + + + + # Nonnull + + ###################################################################### + + def test_create_nonnull_default + assert (object = NonnullEnum.create) +# assert_equal :good, object.value, +# "Enum columns without explicit default, default to first value if null not allowed" + assert object.new_record? + end + + def test_create_nonnull_good + assert (object = NonnullEnum.create(:value => :good)) + assert_equal :good, object.value + assert !object.new_record? + assert (object = NonnullEnum.create(:value => :working)) + assert_equal :working, object.value + assert !object.new_record? + end + + def test_create_nonnull_null + assert (object = NonnullEnum.create(:value => nil)) + assert object.new_record? + end + + def test_create_nonnull_bad + assert (object = NonnullEnum.create(:value => :bad)) + assert object.new_record? + end + + # Nonnull w/ Default + + ###################################################################### + + def test_create_nonnull_wd_default + assert (object = NonnullDefaultEnum.create) + assert_equal :working, object.value + assert !object.new_record? + end + + def test_create_nonnull_wd_good + assert (object = NonnullDefaultEnum.create(:value => :good)) + assert_equal :good, object.value + assert !object.new_record? + assert (object = NonnullDefaultEnum.create(:value => :working)) + assert_equal :working, object.value + assert !object.new_record? + end + + def test_create_nonnull_wd_null + assert (object = NonnullDefaultEnum.create(:value => nil)) + assert object.new_record? + end + + def test_create_nonnull_wd_bad + assert (object = NonnullDefaultEnum.create(:value => :bad)) + assert object.new_record? + end + + def test_quoting + value = ActiveRecord::Base.send(:sanitize_sql, ["value = ? ", :"'" ] ) + assert_equal "value = '\\'' ", value + end +end diff --git a/vendor/plugins/enum-column/test/fixtures/db_definitions/mysql.drop.sql b/vendor/plugins/enum-column/test/fixtures/db_definitions/mysql.drop.sql new file mode 100644 index 0000000..21da5f7 --- /dev/null +++ b/vendor/plugins/enum-column/test/fixtures/db_definitions/mysql.drop.sql @@ -0,0 +1,32 @@ +DROP TABLE accounts; +DROP TABLE funny_jokes; +DROP TABLE companies; +DROP TABLE topics; +DROP TABLE developers; +DROP TABLE projects; +DROP TABLE developers_projects; +DROP TABLE customers; +DROP TABLE orders; +DROP TABLE movies; +DROP TABLE subscribers; +DROP TABLE booleantests; +DROP TABLE auto_id_tests; +DROP TABLE entrants; +DROP TABLE colnametests; +DROP TABLE mixins; +DROP TABLE people; +DROP TABLE readers; +DROP TABLE binaries; +DROP TABLE computers; +DROP TABLE tasks; +DROP TABLE posts; +DROP TABLE comments; +DROP TABLE authors; +DROP TABLE categories; +DROP TABLE categories_posts; +DROP TABLE fk_test_has_fk; +DROP TABLE fk_test_has_pk; +DROP TABLE keyboards; +DROP TABLE enumerations; +DROP TABLE legacy_things; +DROP TABLE numeric_data; diff --git a/vendor/plugins/enum-column/test/fixtures/db_definitions/mysql.sql b/vendor/plugins/enum-column/test/fixtures/db_definitions/mysql.sql new file mode 100755 index 0000000..ff37f7f --- /dev/null +++ b/vendor/plugins/enum-column/test/fixtures/db_definitions/mysql.sql @@ -0,0 +1,244 @@ +CREATE TABLE `accounts` ( + `id` int(11) NOT NULL auto_increment, + `firm_id` int(11) default NULL, + `credit_limit` int(5) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `funny_jokes` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(50) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `companies` ( + `id` int(11) NOT NULL auto_increment, + `type` varchar(50) default NULL, + `ruby_type` varchar(50) default NULL, + `firm_id` int(11) default NULL, + `name` varchar(50) default NULL, + `client_of` int(11) default NULL, + `rating` int(11) default NULL default 1, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + + +CREATE TABLE `topics` ( + `id` int(11) NOT NULL auto_increment, + `title` varchar(255) default NULL, + `author_name` varchar(255) default NULL, + `author_email_address` varchar(255) default NULL, + `written_on` datetime default NULL, + `bonus_time` time default NULL, + `last_read` date default NULL, + `content` text, + `approved` tinyint(1) default 1, + `replies_count` int(11) default 0, + `parent_id` int(11) default NULL, + `type` varchar(50) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `developers` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(100) default NULL, + `salary` int(11) default 70000, + `created_at` datetime default NULL, + `updated_at` datetime default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `projects` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(100) default NULL, + `type` VARCHAR(255) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `developers_projects` ( + `developer_id` int(11) NOT NULL, + `project_id` int(11) NOT NULL, + `joined_on` date default NULL, + `access_level` smallint default 1 +) TYPE=InnoDB; + +CREATE TABLE `orders` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(100) default NULL, + `billing_customer_id` int(11) default NULL, + `shipping_customer_id` int(11) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `customers` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(100) default NULL, + `balance` int(6) default 0, + `address_street` varchar(100) default NULL, + `address_city` varchar(100) default NULL, + `address_country` varchar(100) default NULL, + `gps_location` varchar(100) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `movies` ( + `movieid` int(11) NOT NULL auto_increment, + `name` varchar(100) default NULL, + PRIMARY KEY (`movieid`) +) TYPE=InnoDB; + +CREATE TABLE `subscribers` ( + `nick` varchar(100) NOT NULL, + `name` varchar(100) default NULL, + PRIMARY KEY (`nick`) +) TYPE=InnoDB; + +CREATE TABLE `booleantests` ( + `id` int(11) NOT NULL auto_increment, + `value` integer default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `auto_id_tests` ( + `auto_id` int(11) NOT NULL auto_increment, + `value` integer default NULL, + PRIMARY KEY (`auto_id`) +) TYPE=InnoDB; + +CREATE TABLE `entrants` ( + `id` INTEGER NOT NULL auto_increment PRIMARY KEY, + `name` VARCHAR(255) NOT NULL, + `course_id` INTEGER NOT NULL +); + +CREATE TABLE `colnametests` ( + `id` int(11) NOT NULL auto_increment, + `references` int(11) NOT NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `mixins` ( + `id` int(11) NOT NULL auto_increment, + `parent_id` int(11) default NULL, + `pos` int(11) default NULL, + `created_at` datetime default NULL, + `updated_at` datetime default NULL, + `lft` int(11) default NULL, + `rgt` int(11) default NULL, + `root_id` int(11) default NULL, + `type` varchar(40) default NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `people` ( + `id` INTEGER NOT NULL auto_increment PRIMARY KEY, + `first_name` VARCHAR(40) NOT NULL, + `lock_version` INTEGER NOT NULL DEFAULT 0 +) TYPE=InnoDB; + +CREATE TABLE `readers` ( + `id` int(11) NOT NULL auto_increment PRIMARY KEY, + `post_id` INTEGER NOT NULL, + `person_id` INTEGER NOT NULL +) TYPE=InnoDB; + +CREATE TABLE `binaries` ( + `id` int(11) NOT NULL auto_increment, + `data` mediumblob, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `computers` ( + `id` INTEGER NOT NULL auto_increment PRIMARY KEY, + `developer` INTEGER NOT NULL, + `extendedWarranty` INTEGER NOT NULL +) TYPE=InnoDB; + +CREATE TABLE `posts` ( + `id` INTEGER NOT NULL auto_increment PRIMARY KEY, + `author_id` INTEGER, + `title` VARCHAR(255) NOT NULL, + `body` TEXT NOT NULL, + `type` VARCHAR(255) NOT NULL +) TYPE=InnoDB; + +CREATE TABLE `comments` ( + `id` INTEGER NOT NULL auto_increment PRIMARY KEY, + `post_id` INTEGER NOT NULL, + `body` TEXT NOT NULL, + `type` VARCHAR(255) NOT NULL +) TYPE=InnoDB; + +CREATE TABLE `authors` ( + `id` INTEGER NOT NULL auto_increment PRIMARY KEY, + `name` VARCHAR(255) NOT NULL +) TYPE=InnoDB; + +CREATE TABLE `tasks` ( + `id` int(11) NOT NULL auto_increment, + `starting` datetime NOT NULL default '0000-00-00 00:00:00', + `ending` datetime NOT NULL default '0000-00-00 00:00:00', + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `categories` ( + `id` int(11) NOT NULL auto_increment, + `name` VARCHAR(255) NOT NULL, + `type` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`) +) TYPE=InnoDB; + +CREATE TABLE `categories_posts` ( + `category_id` int(11) NOT NULL, + `post_id` int(11) NOT NULL +) TYPE=InnoDB; + +CREATE TABLE `fk_test_has_pk` ( + `id` INTEGER NOT NULL auto_increment PRIMARY KEY +) TYPE=InnoDB; + +CREATE TABLE `fk_test_has_fk` ( + `id` INTEGER NOT NULL auto_increment PRIMARY KEY, + `fk_id` INTEGER NOT NULL, + + FOREIGN KEY (`fk_id`) REFERENCES `fk_test_has_pk`(`id`) +) TYPE=InnoDB; + + +CREATE TABLE `keyboards` ( + `key_number` int(11) NOT NULL auto_increment primary key, + `name` varchar(50) default NULL +); + +<<<<<<< .mine +CREATE TABLE `enumerations` ( + `id` INTEGER NOT NULL auto_increment PRIMARY KEY, + `severity` enum('low', 'medium', 'high', 'critical') DEFAULT 'medium', + `color` enum('red', 'blue', 'green', 'yellow'), + `string_field` varchar(8) NOT NULL, + `int_field` int(11) +) TYPE=InnoDB; + +--Altered lock_version column name. +======= +-- Altered lock_version column name. +>>>>>>> .r3595 +CREATE TABLE `legacy_things` ( + `id` int(11) NOT NULL auto_increment, + `tps_report_number` int(11) default NULL, + `version` int(11) NOT NULL default 0, + PRIMARY KEY (`id`) +) TYPE=InnoDB; +<<<<<<< .mine + +======= + +CREATE TABLE `numeric_data` ( + `id` INTEGER NOT NULL auto_increment PRIMARY KEY, + `bank_balance` decimal(10,2), + `big_bank_balance` decimal(15,2), + `world_population` decimal(10), + `my_house_population` decimal(2), + `decimal_number_with_default` decimal(3,2) DEFAULT 2.78 +) TYPE=InnoDB; +>>>>>>> .r4885 diff --git a/vendor/plugins/enum-column/test/fixtures/enumeration.rb b/vendor/plugins/enum-column/test/fixtures/enumeration.rb new file mode 100644 index 0000000..a9b7d10 --- /dev/null +++ b/vendor/plugins/enum-column/test/fixtures/enumeration.rb @@ -0,0 +1,20 @@ + +class Enumeration < ActiveRecord::Base + validates_columns :color, :severity, :string_field, :int_field +end + +class BasicEnum < ActiveRecord::Base + validates_columns :value +end + +class BasicDefaultEnum < ActiveRecord::Base + validates_columns :value +end + +class NonnullEnum < ActiveRecord::Base + validates_columns :value +end + +class NonnullDefaultEnum < ActiveRecord::Base + validates_columns :value +end diff --git a/vendor/plugins/enum-column/test/test_helper.rb b/vendor/plugins/enum-column/test/test_helper.rb new file mode 100644 index 0000000..d09aed5 --- /dev/null +++ b/vendor/plugins/enum-column/test/test_helper.rb @@ -0,0 +1,18 @@ +# ============================================================================= +# Include the files required to test Engines. + +# Load the default rails test helper - this will load the environment. +require File.dirname(__FILE__) + '/../../../../test/test_helper' + +plugin_path = File::dirname(__FILE__) + '/..' +schema_file = plugin_path + "/test/db/schema.rb" +load(schema_file) if File.exist?(schema_file) + +# set up the fixtures location to use your engine's fixtures +fixture_path = File.dirname(__FILE__) + "/fixtures/" +Test::Unit::TestCase.fixture_path = fixture_path +$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path) +$LOAD_PATH.unshift(File.dirname(__FILE__)) +# ============================================================================= + +