sequel-inline_schema 0.3.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba38d991fa938c8b49fd8d6b395609ed80191ea733dcbfc91adc539b23a1ad2c
-  data.tar.gz: 58cac869e2b380e53b47e17ba0aa8f8bb47e5553cf5a9ac57b499bd962d76c4e
+  metadata.gz: 5f472b3119c986020f3dcecab118b2985e6aae903e0252a8aa6c987086525688
+  data.tar.gz: 98e02125e66c86ae93e7754ef6c638476a51d25938053c19b03330302cf0477b
 SHA512:
-  metadata.gz: cc518f2f4548126ce2e79c7c5fa619b4d2be33e0db757b6cd90a05bb8b5804938819352225c0ce60b9871e1b526e0d90dff743ca3304215ce33f3eef98c9ae88
-  data.tar.gz: f67ec3eca4fb4e65f1e66b1494d61e0c5f3b636074b88becfb3f28a70e107f3be44b67b613a50dbf63def6778b70f0befd5eb39b043b96ddc34f760ca2d16c73
+  metadata.gz: 749fbeba674e2dcf1ce3949336c13d729a2487a4d3d73974963b9e8c9015b08f92ee57babcd5d3094804128509744346bee4b263e65ccacda66b2e00ca91bd24
+  data.tar.gz: f4089b9ae88912674fd4e4387c3571f1a542c66424c5e55216e2c38cb52dfca8ae749cc0b7eafe3f0bce0e86cf1300f95960370bc3d20a0ec282037d5c931118

data/History.md

@@ -1,6 +1,34 @@
 # Release History for sequel-inline_schema
 
 ---
+## v0.3.4 [2021-11-08] Michael Granger <ged@faeriemud.org>
+
+Improvements:
+
+- Update for Ruby 3, update gem-signing cert.
+
+
+## v0.3.3 [2020-02-24] Michael Granger <ged@faeriemud.org>
+
+Bugfixes:
+
+- Allow options to be passed through #drop_table
+- Fix view_exists? query for schema-qualified table names
+
+
+## v0.3.2 [2020-02-11] Michael Granger <ged@faeriemud.org>
+
+Bugfixes:
+
+- Fixed view hooks and added specs.
+
+
+## v0.3.1 [2020-02-11] Michael Granger <ged@faeriemud.org>
+
+Bugfixes:
+
+- Change back to using `create_view`
+
 
 ## v0.3.0 [2020-02-10] Michael Granger <ged@faeriemud.org>
 

data/README.md

@@ -9,6 +9,9 @@ github
 docs
 : http://deveiate.org/code/sequel-inline_schema
 
+code
+: https://hg.sr.ht/~ged/Sequel-InlineSchema/browse
+
 
 ## Description
 

data/Rakefile

@@ -4,6 +4,5 @@ require 'rake/deveiate'
 
 Rake::DevEiate.setup( 'sequel-inline_schema' ) do |project|
 	project.publish_to = 'deveiate:/usr/local/www/public/code'
-	project.required_ruby_version = '~> 2.5'
 end
 

data/lib/sequel/inline_schema.rb

@@ -7,7 +7,7 @@ require 'sequel/plugins/inline_schema'
 module Sequel::InlineSchema
 
 	# Package version
-	VERSION = '0.3.0'
+	VERSION = '0.3.4'
 
 	# Version control revision
 	REVISION = %q$Revision$

data/lib/sequel/plugins/inline_schema.rb

@@ -175,16 +175,16 @@ module Sequel::Plugins::InlineSchema
 
 
 		### Drops table. If the table doesn't exist, this will probably raise an error.
-		def drop_table
+		def drop_table( opts={} )
 			self.before_drop_table
-			self.db.drop_table( self.table_name )
+			self.db.drop_table( self.table_name, opts )
 			self.after_drop_table
 		end
 
 
 		### Drops table if it already exists, do nothing.
-		def drop_table?
-			self.drop_table if self.table_exists?
+		def drop_table?( opts={} )
+			self.drop_table( opts ) if self.table_exists?
 		end
 
 
@@ -210,8 +210,11 @@ module Sequel::Plugins::InlineSchema
 			dataset = self.view_dataset or raise "No view declared for this model."
 			options = self.view_options.merge( options )
 
+			self.before_create_view
 			self.db.log_info "Creating view %s(%p): %s" % [ self.table_name, options, dataset.sql ]
-			self.db.create_or_replace_view( self.table_name, dataset, options )
+			self.db.create_view( self.table_name, dataset, options )
+			@db_schema = get_db_schema( true )
+			self.after_create_view
 		end
 
 
@@ -236,31 +239,35 @@ module Sequel::Plugins::InlineSchema
 
 
 		### Drop the view backing this model.
-		def drop_view
+		def drop_view( options={} )
 			self.before_drop_view
-			self.db.drop_view( self.table_name )
+			self.db.drop_view( self.table_name, self.view_options.merge(options) )
 			self.after_drop_view
 		end
 
 
 		### Drop the view if it already exists, otherwise do nothing.
-		def drop_view?
-			self.drop_view if self.view_exists?
+		def drop_view?( options={} )
+			self.drop_view( options ) if self.view_exists?
 		end
 
 
 		### Returns true if the view associated with this model exists, false otherwise.
+		### :FIXME: This is PostgreSQL-specific, but there doesn't appear to be any
+		### cross-driver way to check for a view.
 		def view_exists?
 			# Make shortcuts for fully-qualified names
 			class_table = Sequel[:pg_catalog][:pg_class].as( :c )
 			ns_table = Sequel[:pg_catalog][:pg_namespace].as( :n )
 			is_visible = Sequel[:pg_catalog][:pg_table_is_visible]
 
+			_, table, _ = Sequel.split_symbol( self.table_name )
+
 			ds = db[ class_table ].
 				join( ns_table, oid: :relnamespace )
 			ds = ds.where( Sequel[:c][:relkind] => ['v', 'm'] ).
 				exclude( Sequel[:n][:nspname] => /^pg_toast/ ).
-				where( Sequel[:c][:relname] => self.table_name ).
+				where( Sequel[:c][:relname] => table.to_s ).
 				where( Sequel.function(is_visible, Sequel[:c][:oid]) )
 
 			return ds.count == 1
@@ -320,6 +327,18 @@ module Sequel::Plugins::InlineSchema
 		end
 
 
+		### View-drop hook; called before the backing view is dropped.
+		def before_drop_view
+			return true
+		end
+
+
+		### View-drop hook; called after the backing view is dropped.
+		def after_drop_view
+			return true
+		end
+
+
 		#
 		# Schema-state introspection
 		#

data/spec/sequel/plugins/inline_schema_spec.rb

@@ -34,7 +34,23 @@ describe Sequel::Plugins::InlineSchema do
 		mclass
 	end
 
-	let ( :view_dataset ) { model_class.dataset.group_and_count( :age ) }
+	let( :view_dataset ) { model_class.dataset.group_and_count( :age ) }
+
+	let( :view_class ) do
+		view_class = Class.new( Sequel::Model )
+		view_class.plugin( :inline_schema )
+		view_class.set_dataset( db[view] )
+		view_class.set_view_dataset { view_dataset.naked }
+		return view_class
+	end
+
+	let( :materialized_view_class ) do
+		materialized_view_class = Class.new( Sequel::Model )
+		materialized_view_class.plugin( :inline_schema )
+		materialized_view_class.set_dataset( db[view] )
+		materialized_view_class.set_view_dataset( materialized: true ) { view_dataset.naked }
+		return materialized_view_class
+	end
 
 	let( :valid_pg_attributes ) do
 		[
@@ -185,42 +201,72 @@ describe Sequel::Plugins::InlineSchema do
 	end
 
 
+	it "allows a model to pass options when dropping its table" do
+		model_class.drop_table( cascade: true )
+		expect( db.sqls ).to include( %{DROP TABLE "#{table}" CASCADE} )
+	end
 
-	it "allows a model to create a view instead of a table" do
-		view_class = Class.new( Sequel::Model )
-		view_class.plugin( :inline_schema )
-		view_class.set_dataset( db[view] )
-		view_class.set_view_dataset { view_dataset.naked }
 
+	it "allows a model to create a view instead of a table" do
 		db.fetch = fake_db_fetcher
 		db.sqls.clear
 
 		view_class.create_view
 
 		expect( db.sqls ).to include(
-			%{CREATE OR REPLACE VIEW "#{view}" AS SELECT "age", count(*) AS "count" FROM "#{table}" GROUP BY "age"}
+			%{CREATE VIEW "#{view}" AS SELECT "age", count(*) AS "count" FROM "#{table}" GROUP BY "age"}
 		)
 	end
 
 
-	it "allows a model to craete a materialized view instead of a table" do
-		materialized_view_class = Class.new( Sequel::Model )
-		materialized_view_class.plugin( :inline_schema )
-		materialized_view_class.set_dataset( db[view] )
-		materialized_view_class.set_view_dataset( materialized: true ) { view_dataset.naked }
-
+	it "allows a model to create a materialized view instead of a table" do
 		db.fetch = fake_db_fetcher
 		db.sqls.clear
 
 		materialized_view_class.create_view
 
 		expect( db.sqls ).to include(
-			%{CREATE OR REPLACE MATERIALIZED VIEW "#{view}" AS SELECT "age", count(*) AS "count" } +
+			%{CREATE MATERIALIZED VIEW "#{view}" AS SELECT "age", count(*) AS "count" } +
 			%{FROM "#{table}" GROUP BY "age"}
 		)
 	end
 
 
+	it "allows a model to determine whether its view exists or not" do
+		view_class.view_exists?
+		statements = db.sqls.dup
+
+		expect( statements.last ).to include( %{WHERE (("c"."relkind" IN ('v', 'm'))} )
+		expect( statements.last ).to include(
+			%{("c"."relname" = '#{view}') AND "pg_catalog"."pg_table_is_visible"("c"."oid")) LIMIT 1}
+		)
+	end
+
+
+	it "allows a model to drop its view" do
+		db.fetch = fake_db_fetcher
+		db.sqls.clear
+
+		view_class.drop_view
+
+		expect( db.sqls ).to include(
+			%{DROP VIEW "#{view}"}
+		)
+	end
+
+
+	it "allows a model to drop its materialized view" do
+		db.fetch = fake_db_fetcher
+		db.sqls.clear
+
+		materialized_view_class.drop_view
+
+		expect( db.sqls ).to include(
+			%{DROP MATERIALIZED VIEW "#{view}"}
+		)
+	end
+
+
 	describe "table-creation ordering" do
 
 		let( :fake_db_fetcher ) do
@@ -308,7 +354,7 @@ describe Sequel::Plugins::InlineSchema do
 	end
 
 
-	describe "hooks" do
+	describe "table hooks" do
 
 		let( :model_class ) do
 			class_obj = super()
@@ -439,5 +485,137 @@ describe Sequel::Plugins::InlineSchema do
 
 	end
 
+
+	describe "view hooks" do
+
+		let( :view_class ) do
+			class_obj = super()
+			class_obj.singleton_class.send( :attr_accessor, :called )
+			class_obj.called = {}
+			class_obj
+		end
+
+
+		it "calls a hook before creating the model's view" do
+			def view_class.before_create_view
+				self.called[ :before_create_view ] = true
+				super
+			end
+
+			view_class.create_view
+
+			expect( view_class.called ).to include( :before_create_view )
+		end
+
+
+		it "allows cancellation of create_view from the before_create_view hook" do
+			def view_class.before_create_view
+				self.called[ :before_create_view ] = true
+				cancel_action
+			end
+
+			expect {
+				view_class.create_view
+			}.to raise_error( Sequel::HookFailed, /hook failed/i )
+		end
+
+
+		it "allows cancellation of create_view with a message from the before_create_view hook" do
+			def view_class.before_create_view
+				self.called[ :before_create_view ] = true
+				cancel_action( "Wait, don't create yet!" )
+			end
+
+			expect {
+				view_class.create_view
+			}.to raise_error( Sequel::HookFailed, "Wait, don't create yet!" )
+		end
+
+
+		it "allows cancellation of create_view with a Symbol from the before_create_view hook" do
+			def view_class.before_create_view
+				self.called[ :before_create_view ] = true
+				cancel_action( :before_create_view )
+			end
+
+			expect {
+				view_class.create_view
+			}.to raise_error( Sequel::HookFailed, /before_create_view/ )
+		end
+
+
+		it "calls a hook after view creation" do
+			def view_class.after_create_view
+				super
+				self.called[ :after_create_view ] = true
+			end
+
+			view_class.create_view
+
+			expect( view_class.called ).to include( :after_create_view )
+		end
+
+
+		it "calls a hook before dropping the model's view" do
+			def view_class.before_drop_view
+				self.called[ :before_drop_view ] = true
+				super
+			end
+
+			view_class.drop_view
+
+			expect( view_class.called ).to include( :before_drop_view )
+		end
+
+
+		it "allows cancellation of drop_view from the before_drop_view hook" do
+			def view_class.before_drop_view
+				self.called[ :before_drop_view ] = true
+				cancel_action
+			end
+
+			expect {
+				view_class.drop_view
+			}.to raise_error( Sequel::HookFailed, /hook failed/i )
+		end
+
+
+		it "allows cancellation of drop_view with a message from the before_drop_view hook" do
+			def view_class.before_drop_view
+				self.called[ :before_drop_view ] = true
+				cancel_action( "Wait, don't drop yet!" )
+			end
+
+			expect {
+				view_class.drop_view
+			}.to raise_error( Sequel::HookFailed, "Wait, don't drop yet!" )
+		end
+
+
+		it "allows cancellation of drop_view with a Symbol from the before_drop_view hook" do
+			def view_class.before_drop_view
+				self.called[ :before_drop_view ] = true
+				cancel_action( :before_drop_view )
+			end
+
+			expect {
+				view_class.drop_view
+			}.to raise_error( Sequel::HookFailed, /before_drop_view/ )
+		end
+
+
+		it "calls a hook after a class's view is dropped" do
+			def view_class.after_drop_view
+				super
+				self.called[ :after_drop_view ] = true
+			end
+
+			view_class.drop_view
+
+			expect( view_class.called ).to include( :after_drop_view )
+		end
+
+	end
+
 end
 

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: sequel-inline_schema
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Michael Granger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
-  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xOTEwMDkwMDM2NTdaFw0yMDEwMDgwMDM2
-  NTdaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+  MIID+DCCAmCgAwIBAgIBAzANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
+  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0yMDEyMjQyMDU1MjlaFw0yMTEyMjQyMDU1
+  MjlaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
   hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
   L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
   M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
@@ -21,20 +21,19 @@ cert_chain:
   vQ66lts4alKC69TE5cuKasWBm+16A4aEe3XdZBRNmtOu/g81gvwA7fkJHKllJuaI
   dXzdHqq+zbGZVSQ7pRYHYomD0IiDe1DbIouFnPWmagaBnGHwXkDT2bKKP+s2v21m
   ozilJg4aar2okb/RA6VS87o+d7g6LpDDMMQjH4G9OPnJENLdhu8KnPw/ivSVvQw7
-  N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
-  VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DAcBgNVHREE
-  FTATgRFnZWRARmFlcmllTVVELm9yZzAcBgNVHRIEFTATgRFnZWRARmFlcmllTVVE
-  Lm9yZzANBgkqhkiG9w0BAQsFAAOCAYEAFqsr6o0SvQRgjQVmhbQvExRnCMCoW1yb
-  FJiN7A5RA2Iy2E61OG1Ul5nGmaDmx/PNB/6JIbIV3B9Uq8aTZx4uOjK7r8vMl1/t
-  ZfY7r6HejJfXlcO2m6JDMbpdyEVv916LncBkzZRz6vnnNCx+31f15FKddxujpAFd
-  qpn3JRQY+oj7ZkoccL/IUiDpxQWeS3oOoz9qr2kVTp8R50InZimt79FqCl/1m66W
-  kdOuf+wM3DDx7Rt4IVNHrhGlyfMr7xjKW1Q3gll+pMN1DT6Ajx/t3JDSEg7BnnEW
-  r7AciSO6J4ApUdqyG+coLFlGdtgFTgRHv7ihbQtDI7Z/LV7A4Spn1j2PK3j0Omri
-  kSl1hPVigRytfgdVGiLXzvkkrkgj9EknCaj5UHbac7XvVBrljXj9hsnnqTANaKsg
-  jBZSA+N+xUTgUWpXjjwsLZjzJkhWATJWq+krNXcqpwXo6HsjmdUxoFMt63RBb+sI
-  XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
+  N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYD
+  VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DANBgkqhkiG
+  9w0BAQsFAAOCAYEAMYegZanJi8zq7QKPT7wqXefX4C88I5JWeBHR3PvvWK0CwyMV
+  peyiu5I13w/lYX+HUZjE4qsSpJMJFXWl4WZCOo+AMprOcf0PxfuJpxCej5D4tavf
+  vRfhahSw7XJrcZih/3J+/UgoH7R05MJ+8LTcy3HGrB3a0vTafjm8OY7Xpa0LJDoN
+  JDqxK321VIHyTibbKeA1hWSE6ljlQDvFbTqiCj3Ulp1jTv3TOlvRl8fqcfhxUJI0
+  +5Q82jJODjEN+GaWs0V+NlrbU94cXwS2PH5dXogftB5YYA5Ex8A0ikZ73xns4Hdo
+  XxdLdd92F5ovxA23j/rKe/IDwqr6FpDkU3nPXH/Qp0TVGv9zZnVJc/Z6ChkuWj8z
+  pW7JAyyiiHZgKKDReDrA2LA7Zs3o/7KA6UtUH0FHf8LYhcK+pfHk6RtjRe65ffw+
+  MCh97sQ/Z/MOusb5+QddBmB+k8EicXyGNl4b5L4XpL7fIQu+Y96TB3JEJlShxFD9
+  k9FjI4d9EP54gS/4
   -----END CERTIFICATE-----
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -42,14 +41,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.50'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.50'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +69,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -106,9 +105,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-description: |-
-  This is a set of plugins for Sequel for declaring a model's table schema and
-  any migrations in the class itself (similar to the legacy <code>schema</code> plugin).
+description: This is a set of plugins for Sequel for declaring a model&#39;s table
+  schema and any migrations in the class itself (similar to the legacy schema plugin).
 email:
 - ged@faeriemud.org
 executables: []
@@ -131,26 +129,30 @@ files:
 homepage: https://hg.sr.ht/~ged/Sequel-InlineSchema
 licenses:
 - BSD-3-Clause
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://hg.sr.ht/~ged/Sequel-InlineSchema
+  documentation_uri: http://deveiate.org/code/sequel-inline_schema
+  changelog_uri: http://deveiate.org/code/sequel-inline_schema/History_md.html
+  source_uri: https://hg.sr.ht/~ged/Sequel-InlineSchema/browse
+  bug_tracker_uri: https://todo.sr.ht/~ged/Sequel-InlineSchema/browse
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
-summary: This is a set of plugins for Sequel for declaring a model's table schema
-  and any migrations in the class itself (similar to the legacy <code>schema</code>
-  plugin).
+summary: This is a set of plugins for Sequel for declaring a model&#39;s table schema
+  and any migrations in the class itself (similar to the legacy schema plugin).
 test_files: []