From 2ad45b691968bb6f35e98742da2f171968378e03 Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Mon, 8 Jun 2015 15:31:15 +0300 Subject: [PATCH] pri.ee fix #2125 --- db/schema.rb | 34 ++++++++++++++-------------- lib/tasks/zonefile.rake | 2 +- spec/models/zonefile_setting_spec.rb | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 48396524a..ac1e7e118 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -19,7 +19,7 @@ ActiveRecord::Schema.define(version: 20150603212659) do create_table "account_activities", force: :cascade do |t| t.integer "account_id" t.integer "invoice_id" - t.decimal "sum", precision: 10, scale: 2 + t.decimal "sum", precision: 8, scale: 2 t.string "currency" t.integer "bank_transaction_id" t.datetime "created_at" @@ -36,7 +36,7 @@ ActiveRecord::Schema.define(version: 20150603212659) do create_table "accounts", force: :cascade do |t| t.integer "registrar_id" t.string "account_type" - t.decimal "balance", precision: 10, scale: 2, default: 0.0, null: false + t.decimal "balance", precision: 8, scale: 2, default: 0.0, null: false t.datetime "created_at" t.datetime "updated_at" t.string "currency" @@ -98,7 +98,7 @@ ActiveRecord::Schema.define(version: 20150603212659) do t.string "buyer_name" t.string "document_no" t.string "description" - t.decimal "sum", precision: 10, scale: 2 + t.decimal "sum", precision: 8, scale: 2 t.string "reference_no" t.datetime "paid_at" t.datetime "created_at" @@ -114,7 +114,7 @@ ActiveRecord::Schema.define(version: 20150603212659) do t.string "vk_rec_id" t.string "vk_stamp" t.string "vk_t_no" - t.decimal "vk_amount", precision: 10, scale: 2 + t.decimal "vk_amount", precision: 8, scale: 2 t.string "vk_curr" t.string "vk_rec_acc" t.string "vk_rec_name" @@ -328,10 +328,10 @@ ActiveRecord::Schema.define(version: 20150603212659) do create_table "invoice_items", force: :cascade do |t| t.integer "invoice_id" - t.string "description", null: false + t.string "description", null: false t.string "unit" t.integer "amount" - t.decimal "price", precision: 10, scale: 2 + t.decimal "price", precision: 8, scale: 2 t.datetime "created_at" t.datetime "updated_at" t.string "creator_str" @@ -341,20 +341,20 @@ ActiveRecord::Schema.define(version: 20150603212659) do add_index "invoice_items", ["invoice_id"], name: "index_invoice_items_on_invoice_id", using: :btree create_table "invoices", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "invoice_type", null: false - t.datetime "due_date", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "invoice_type", null: false + t.datetime "due_date", null: false t.string "payment_term" - t.string "currency", null: false + t.string "currency", null: false t.string "description" t.string "reference_no" - t.decimal "vat_prc", precision: 10, scale: 2, null: false + t.decimal "vat_prc", precision: 8, scale: 2, null: false t.datetime "paid_at" t.integer "seller_id" - t.string "seller_name", null: false + t.string "seller_name", null: false t.string "seller_reg_no" - t.string "seller_iban", null: false + t.string "seller_iban", null: false t.string "seller_bank" t.string "seller_swift" t.string "seller_vat_no" @@ -368,7 +368,7 @@ ActiveRecord::Schema.define(version: 20150603212659) do t.string "seller_email" t.string "seller_contact_name" t.integer "buyer_id" - t.string "buyer_name", null: false + t.string "buyer_name", null: false t.string "buyer_reg_no" t.string "buyer_country_code" t.string "buyer_state" @@ -382,7 +382,7 @@ ActiveRecord::Schema.define(version: 20150603212659) do t.string "updator_str" t.integer "number" t.datetime "cancelled_at" - t.decimal "sum_cache", precision: 10, scale: 2 + t.decimal "sum_cache", precision: 8, scale: 2 end add_index "invoices", ["buyer_id"], name: "index_invoices_on_buyer_id", using: :btree @@ -982,7 +982,7 @@ ActiveRecord::Schema.define(version: 20150603212659) do t.text "crt" t.string "type" t.string "registrant_ident" - t.string "encrypted_password", default: "" + t.string "encrypted_password", default: "", null: false t.datetime "remember_created_at" t.integer "failed_attempts", default: 0, null: false t.datetime "locked_at" diff --git a/lib/tasks/zonefile.rake b/lib/tasks/zonefile.rake index 11b7c7fe3..3609341cd 100644 --- a/lib/tasks/zonefile.rake +++ b/lib/tasks/zonefile.rake @@ -13,7 +13,7 @@ namespace :zonefile do ret text; BEGIN -- define filters - include_filter = '%' || i_origin; + include_filter = '%.' || i_origin; -- for %.%.% IF i_origin ~ '\\.' THEN diff --git a/spec/models/zonefile_setting_spec.rb b/spec/models/zonefile_setting_spec.rb index 9604a1cd0..c8909f2eb 100644 --- a/spec/models/zonefile_setting_spec.rb +++ b/spec/models/zonefile_setting_spec.rb @@ -24,7 +24,7 @@ describe ZonefileSetting do master_nameserver: 'ns.tld.ee' }).first_or_create! - d = Fabricate(:domain_with_dnskeys) + d = Fabricate(:domain_with_dnskeys, name: 'testpri.ee') d.nameservers << Nameserver.new({ hostname: "ns.#{d.name}", ipv4: '123.123.123.123',