schema_plus_default_expr 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 233c5f272e73d93ee11a5689c290511864c4e613
4
- data.tar.gz: b5989731ef1ccb2cd48b8d3e75c591d2bb3a57ec
3
+ metadata.gz: 44fabc8c3f10cafca1397f164d5977d937900513
4
+ data.tar.gz: ce0a1818447e022b5308898cacb419865f97b396
5
5
  SHA512:
6
- metadata.gz: 37137a6e9c15d2873bcd7b2fc0b37c1e13e9d3efe7838c520d1f3f748e417015fd026c2cf650ea117c9aa7c9a17c48319de9eb66dd38da8328dea40b171b968a
7
- data.tar.gz: 5dc9dc12ca8166865a7867220ac324e48eabc81d0c9ef873934a900ad0a15646f5610dfab46ac6d134c83891c235ebb574fa968e6cae83ea5f853f967ad6d642
6
+ metadata.gz: 516f226ba7aa5ffa0aedb83349a805cb49dc246effcc9803292b19ae78672cd4c1a155e574c59bcdcd64a54a7df089180086791e07cd1fe75fc23766fa92e832
7
+ data.tar.gz: dac0f06442864762b8c132db809d8083e4d556e518087ec8d0892f74627d5134aa40f9bc761be710914c6ea94de0fcc49499cecd94e41f355b173909710f0839
data/.gitignore CHANGED
@@ -3,6 +3,7 @@
3
3
  /pkg
4
4
  /Gemfile.local
5
5
 
6
+ .byebug_history
6
7
  *.lock
7
8
  *.log
8
9
  *.sqlite3
data/.travis.yml CHANGED
@@ -11,7 +11,7 @@ gemfile:
11
11
  - gemfiles/activerecord-4.2/Gemfile.sqlite3
12
12
  env: POSTGRESQL_DB_USER=postgres
13
13
  addons:
14
- postgresql: '9.3'
14
+ postgresql: '9.4'
15
15
  before_script: bundle exec rake create_databases
16
16
  after_script: bundle exec rake drop_databases
17
17
  script: bundle exec rake travis
data/README.md CHANGED
@@ -67,6 +67,7 @@ If you are using Postgresql with a `json` column, ActiveRecord allows you to use
67
67
 
68
68
  ## History
69
69
 
70
+ * 0.1.1 - Fix dumping bug (#1); upgrade to schema_plus_core 1.0
70
71
  * 0.1.0 - Initial release, extracted from schema_plus 1.x
71
72
 
72
73
  ## Development & Testing
@@ -1,3 +1,3 @@
1
1
  eval File.read File.expand_path('../../Gemfile.base', __FILE__)
2
2
 
3
- gem "activerecord", "~> 4.2.0"
3
+ gem "activerecord", "~> 4.2.6"
@@ -42,9 +42,7 @@ module SchemaPlus::DefaultExpr
42
42
  env.connection.columns(env.table.name).each do |column|
43
43
  if !column.default_function.nil?
44
44
  if col = env.table.columns.find(&its.name == column.name)
45
- options = "default: { expr: #{column.default_function.inspect} }"
46
- options += ", #{col.options}" unless col.options.blank?
47
- col.options = options
45
+ col.options[:default] = { expr: column.default_function }
48
46
  end
49
47
  end
50
48
  end
@@ -1,5 +1,5 @@
1
1
  module SchemaPlus
2
2
  module DefaultExpr
3
- VERSION = "0.1.0"
3
+ VERSION = "0.1.1"
4
4
  end
5
5
  end
@@ -18,12 +18,12 @@ Gem::Specification.new do |gem|
18
18
  gem.require_paths = ["lib"]
19
19
 
20
20
  gem.add_dependency "activerecord", "~> 4.2"
21
- gem.add_dependency "schema_plus_core", "~> 0.2", ">= 0.2.1"
21
+ gem.add_dependency "schema_plus_core", "~> 1.0"
22
22
 
23
23
  gem.add_development_dependency "bundler", "~> 1.7"
24
24
  gem.add_development_dependency "rake", "~> 10.0"
25
25
  gem.add_development_dependency "rspec", "~> 3.0"
26
- gem.add_development_dependency "schema_dev", "~> 3.4"
26
+ gem.add_development_dependency "schema_dev", "~> 3.6"
27
27
  gem.add_development_dependency "simplecov"
28
28
  gem.add_development_dependency "simplecov-gem-profile"
29
29
  end
@@ -34,13 +34,13 @@ describe "Schema dump" do
34
34
  context "with date default", :postgresql => :only do
35
35
  it "should dump the default hash expr as now()" do
36
36
  with_additional_column Post, :posted_at, :datetime, :default => :now do
37
- expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"now\(\)"\s*\}})
37
+ expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"now\(\)"\s*\}\s*$})
38
38
  end
39
39
  end
40
40
 
41
41
  it "should dump the default hash expr as CURRENT_TIMESTAMP" do
42
42
  with_additional_column Post, :posted_at, :datetime, :default => {:expr => 'date \'2001-09-28\''} do
43
- expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>).*2001-09-28.*})
43
+ expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default\s*=>).*2001-09-28.*})
44
44
  end
45
45
  end
46
46
 
@@ -54,19 +54,19 @@ describe "Schema dump" do
54
54
  context "with date default", :sqlite3 => :only do
55
55
  it "should dump the default hash expr as now" do
56
56
  with_additional_column Post, :posted_at, :datetime, :default => :now do
57
- expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
57
+ expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"\(DATETIME\('now'\)\)"\s*\}})
58
58
  end
59
59
  end
60
60
 
61
61
  it "should dump the default hash expr string as now" do
62
62
  with_additional_column Post, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
63
- expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
63
+ expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"\(DATETIME\('now'\)\)"\s*\}})
64
64
  end
65
65
  end
66
66
 
67
67
  it "should dump the default value normally" do
68
68
  with_additional_column Post, :posted_at, :string, :default => "now" do
69
- expect(dump_posts).to match(%r{t\.string\s*"posted_at",\s*(?:default:|:default =>)\s*"now"})
69
+ expect(dump_posts).to match(%r{t\.string\s*"posted_at",\s*(?:default:|:default\s*=>)\s*"now"})
70
70
  end
71
71
  end
72
72
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: schema_plus_default_expr
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - ronen barzel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-01 00:00:00.000000000 Z
11
+ date: 2016-03-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord
@@ -30,20 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '0.2'
34
- - - ">="
35
- - !ruby/object:Gem::Version
36
- version: 0.2.1
33
+ version: '1.0'
37
34
  type: :runtime
38
35
  prerelease: false
39
36
  version_requirements: !ruby/object:Gem::Requirement
40
37
  requirements:
41
38
  - - "~>"
42
39
  - !ruby/object:Gem::Version
43
- version: '0.2'
44
- - - ">="
45
- - !ruby/object:Gem::Version
46
- version: 0.2.1
40
+ version: '1.0'
47
41
  - !ruby/object:Gem::Dependency
48
42
  name: bundler
49
43
  requirement: !ruby/object:Gem::Requirement
@@ -92,14 +86,14 @@ dependencies:
92
86
  requirements:
93
87
  - - "~>"
94
88
  - !ruby/object:Gem::Version
95
- version: '3.4'
89
+ version: '3.6'
96
90
  type: :development
97
91
  prerelease: false
98
92
  version_requirements: !ruby/object:Gem::Requirement
99
93
  requirements:
100
94
  - - "~>"
101
95
  - !ruby/object:Gem::Version
102
- version: '3.4'
96
+ version: '3.6'
103
97
  - !ruby/object:Gem::Dependency
104
98
  name: simplecov
105
99
  requirement: !ruby/object:Gem::Requirement