sequel-inline_schema 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 698af5cd91bac6d8f22da1c5b27c1fe9bee6de7783c50e8797e4d3b1c006b8f2
-  data.tar.gz: 82405a67152c84ce7f7deb29136d5be145032fc835b3f91f8b46c08c85a1d007
+  metadata.gz: 8d62b937115b61c4fdbf02a67439eac074d97a480807c58a39fe3986ad9871b1
+  data.tar.gz: 179d308737aaceb2a1e3021087745c13ec5f38cd9f51baf111d0d4c59df38d14
 SHA512:
-  metadata.gz: 76370fa88d1c87fb2b3a2537c621c1b34ac3a15fa353b12db305e33af42e8c240ffa81eb97ab1b3a573d6aee3bf9f4aabccb554920fb832aa187208c926b2307
-  data.tar.gz: 50b13fe397a824b3d799b7d17fd4624cbb5b794ecfa01f75a4d7232a73aee349bba809f49f5a4092a9077f2630dea8f83dfa0428398b778670c3f14b668199a1
+  metadata.gz: 3ae55f495312766e40bdec536da6d05b2fb8830b37080c8ea983cdd2e04b98675f4fb9e18dd3e1b11420d30e4d2108b2c2bb135e96a261854da108c736dd985c
+  data.tar.gz: 3a8192baa58acac959e36e42fb68d2dd166a03ccc8711b4f0b8eddbd8fc69a068501e9b71efb5cf978c572893b88d248670cf5c59842fa81fa2319c728bffecf

data/History.md

@@ -2,6 +2,14 @@
 
 ---
 
+## 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:

data/lib/sequel/inline_schema.rb

@@ -7,7 +7,7 @@ require 'sequel/plugins/inline_schema'
 module Sequel::InlineSchema
 
 	# Package version
-	VERSION = '0.3.2'
+	VERSION = '0.3.3'
 
 	# 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
 
 
@@ -253,17 +253,21 @@ module Sequel::Plugins::InlineSchema
 
 
 		### 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

data/spec/sequel/plugins/inline_schema_spec.rb

@@ -201,6 +201,11 @@ 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
 		db.fetch = fake_db_fetcher
@@ -214,7 +219,7 @@ describe Sequel::Plugins::InlineSchema do
 	end
 
 
-	it "allows a model to craete a materialized view instead of a table" do
+	it "allows a model to create a materialized view instead of a table" do
 		db.fetch = fake_db_fetcher
 		db.sqls.clear
 
@@ -227,6 +232,17 @@ describe Sequel::Plugins::InlineSchema do
 	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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-inline_schema
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Michael Granger
@@ -34,7 +34,7 @@ cert_chain:
   jBZSA+N+xUTgUWpXjjwsLZjzJkhWATJWq+krNXcqpwXo6HsjmdUxoFMt63RBb+sI
   XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
   -----END CERTIFICATE-----
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel